X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c416e92254512408c1d0ce729e8d3cf82ec9938..23915072bbacb40c5757911a9125eff7f119c52e:/src/s4u/s4u_Storage.cpp diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp index c26d4a556c..6080b06cbd 100644 --- a/src/s4u/s4u_Storage.cpp +++ b/src/s4u/s4u_Storage.cpp @@ -19,22 +19,20 @@ template class Extendable; 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* whereTo) +void getStorageList(std::map* whereTo) { - for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) + for (auto const& s : simgrid::s4u::Engine::get_instance()->get_all_storages()) whereTo->insert({s->get_name(), s}); } Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name) { - simgrid::s4u::Engine::getInstance()->add_storage(name, this); + simgrid::s4u::Engine::get_instance()->storage_register(name, this); } Storage* Storage::byName(std::string name) { - return Engine::getInstance()->storage_by_name_or_null(name); + return Engine::get_instance()->storage_by_name_or_null(name); } 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() { - std::vector storage_list = simgrid::s4u::Engine::getInstance()->getAllStorages(); + std::vector storage_list = simgrid::s4u::Engine::get_instance()->get_all_storages(); xbt_dynar_t res = xbt_dynar_new(sizeof(sg_storage_t), nullptr); for (auto const& s : storage_list) xbt_dynar_push(res, &s);