A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put deprecated annotation at declaration.
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Storage.hpp
diff --git
a/include/simgrid/s4u/Storage.hpp
b/include/simgrid/s4u/Storage.hpp
index
5366365
..
3204e04
100644
(file)
--- a/
include/simgrid/s4u/Storage.hpp
+++ b/
include/simgrid/s4u/Storage.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2006-2015, 2017-2018. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-7,13
+6,13
@@
#ifndef INCLUDE_SIMGRID_S4U_STORAGE_HPP_
#define INCLUDE_SIMGRID_S4U_STORAGE_HPP_
#ifndef INCLUDE_SIMGRID_S4U_STORAGE_HPP_
#define INCLUDE_SIMGRID_S4U_STORAGE_HPP_
-#include "xbt/Extendable.hpp"
+#include <simgrid/forward.h>
+#include <xbt/Extendable.hpp>
+#include <xbt/base.h>
+
#include <map>
#include <map>
-#include <simgrid/s4u/forward.hpp>
-#include <simgrid/simix.h>
#include <string>
#include <unordered_map>
#include <string>
#include <unordered_map>
-#include <xbt/base.h>
namespace simgrid {
namespace xbt {
namespace simgrid {
namespace xbt {
@@
-21,7
+20,9
@@
extern template class XBT_PUBLIC Extendable<simgrid::s4u::Storage>;
}
namespace s4u {
}
namespace s4u {
-XBT_PUBLIC void getStorageList(std::map<std::string, Storage*>* whereTo);
+XBT_ATTRIB_DEPRECATED_v322(
+ "simgrid::s4u::getStorageList() is deprecated in favor of Engine::getAllStorages(). Please switch before v3.22")
+ XBT_PUBLIC void getStorageList(std::map<std::string, Storage*>* whereTo);
class XBT_PUBLIC Storage : public simgrid::xbt::Extendable<Storage> {
friend s4u::Engine;
class XBT_PUBLIC Storage : public simgrid::xbt::Extendable<Storage> {
friend s4u::Engine;
@@
-32,10
+33,15
@@
public:
virtual ~Storage() = default;
/** Retrieve a Storage by its name. It must exist in the platform file */
static Storage* byName(std::string name);
virtual ~Storage() = default;
/** Retrieve a Storage by its name. It must exist in the platform file */
static Storage* byName(std::string name);
+
+ XBT_ATTRIB_DEPRECATED_v323("Please use Storage::get_name()") std::string const& getName() const { return get_name(); }
+ XBT_ATTRIB_DEPRECATED_v323("Please use Storage::get_cname()") const char* getCname() const { return get_cname(); }
+
/** @brief Retrieves the name of that storage as a C++ string */
/** @brief Retrieves the name of that storage as a C++ string */
- std::string const& get
N
ame() const;
+ std::string const& get
_n
ame() const;
/** @brief Retrieves the name of that storage as a C string */
/** @brief Retrieves the name of that storage as a C string */
- const char* getCname() const;
+ const char* get_cname() const;
+
const char* getType();
Host* getHost();
const char* getType();
Host* getHost();