X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba9a4cfeba4eb00e84cd17603fc9654e81445655..5e3adb6026f929615076da0e5a32dc35a02db573:/src/s4u/s4u_storage.cpp diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp index 6b99ef8bde..04c1ee4fbd 100644 --- a/src/s4u/s4u_storage.cpp +++ b/src/s4u/s4u_storage.cpp @@ -15,7 +15,7 @@ namespace s4u { boost::unordered_map *Storage::storages_ = new boost::unordered_map (); Storage::Storage(std::string name, smx_storage_t inferior) { name_ = name; - inferior_ = inferior; + pimpl_ = inferior; storages_->insert({name, this}); } @@ -25,15 +25,15 @@ Storage::~Storage() { } smx_storage_t Storage::inferior() { - return inferior_; + return pimpl_; } Storage &Storage::byName(const char*name) { - s4u::Storage *res = NULL; + s4u::Storage *res = nullptr; try { res = storages_->at(name); } catch (std::out_of_range& e) { smx_storage_t inferior = xbt_lib_get_elm_or_null(storage_lib,name); - if (inferior == NULL) + if (inferior == nullptr) xbt_die("Storage %s does not exist. Please only use the storages that are defined in your platform.", name); res = new Storage(name,inferior); @@ -46,13 +46,13 @@ const char*Storage::name() { } sg_size_t Storage::sizeFree() { - return simcall_storage_get_free_size(inferior_); + return simcall_storage_get_free_size(pimpl_); } sg_size_t Storage::sizeUsed() { - return simcall_storage_get_used_size(inferior_); + return simcall_storage_get_used_size(pimpl_); } sg_size_t Storage::size() { - return SIMIX_storage_get_size(inferior_); + return SIMIX_storage_get_size(pimpl_); } } /* namespace s4u */