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
cosmetics: reorder file to be consistent with others
[simgrid.git]
/
src
/
s4u
/
s4u_Storage.cpp
diff --git
a/src/s4u/s4u_Storage.cpp
b/src/s4u/s4u_Storage.cpp
index
4179d0c
..
6080b06
100644
(file)
--- a/
src/s4u/s4u_Storage.cpp
+++ b/
src/s4u/s4u_Storage.cpp
@@
-19,22
+19,20
@@
template class Extendable<simgrid::s4u::Storage>;
namespace s4u {
namespace s4u {
-void XBT_ATTRIB_DEPRECATED_v322(
- "simgrid::s4u::getStorageList() is deprecated in favor of Engine::getAllStorages(). Please switch before v3.22")
- getStorageList(std::map<std::string, Storage*>* whereTo)
+void getStorageList(std::map<std::string, Storage*>* whereTo)
{
{
- for (auto const& s : simgrid::s4u::Engine::get
Instance()->getAllS
torages())
+ for (auto const& s : simgrid::s4u::Engine::get
_instance()->get_all_s
torages())
whereTo->insert({s->get_name(), s});
}
Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
whereTo->insert({s->get_name(), s});
}
Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
{
- simgrid::s4u::Engine::get
Instance()->addStorage
(name, this);
+ simgrid::s4u::Engine::get
_instance()->storage_register
(name, this);
}
Storage* Storage::byName(std::string name)
{
}
Storage* Storage::byName(std::string name)
{
- return Engine::get
Instance()->storageByNameOrN
ull(name);
+ return Engine::get
_instance()->storage_by_name_or_n
ull(name);
}
const std::string& Storage::get_name() const
}
const std::string& Storage::get_name() const
@@
-172,7
+170,7
@@
sg_storage_t sg_storage_get_by_name(const char* name)
*/
xbt_dynar_t sg_storages_as_dynar()
{
*/
xbt_dynar_t sg_storages_as_dynar()
{
- std::vector<simgrid::s4u::Storage*> storage_list = simgrid::s4u::Engine::get
Instance()->getAllS
torages();
+ std::vector<simgrid::s4u::Storage*> storage_list = simgrid::s4u::Engine::get
_instance()->get_all_s
torages();
xbt_dynar_t res = xbt_dynar_new(sizeof(sg_storage_t), nullptr);
for (auto const& s : storage_list)
xbt_dynar_push(res, &s);
xbt_dynar_t res = xbt_dynar_new(sizeof(sg_storage_t), nullptr);
for (auto const& s : storage_list)
xbt_dynar_push(res, &s);