WIP stop using const char* in C++ layers

[simgrid.git] / src / s4u / s4u_storage.cpp

diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp
index 3c5bb11..c6e3334 100644 (file)
--- a/src/s4u/s4u_storage.cpp
+++ b/src/s4u/s4u_storage.cpp
@@ -12,47 +12,44 @@ extern xbt_lib_t storage_lib;
 namespace simgrid {
 namespace s4u {
 
-boost::unordered_map <std::string, Storage *> *Storage::storages = new boost::unordered_map<std::string, Storage*> ();
-Storage::Storage(std::string name, smx_storage_t inferior) {
-       p_name = name;
-       p_inferior = inferior;
-
-       storages->insert({name, this});
+boost::unordered_map <std::string, Storage *> *Storage::storages_ = new boost::unordered_map<std::string, Storage*> ();
+Storage::Storage(std::string name, smx_storage_t inferior) :
+    name_(name), pimpl_(inferior)
+{
+  storages_->insert({name, this});
 }
 
-Storage::~Storage() {
-       // TODO Auto-generated destructor stub
-}
+Storage::~Storage() = default;
 
 smx_storage_t Storage::inferior() {
-       return p_inferior;
+  return pimpl_;
 }
 Storage &Storage::byName(const char*name) {
-       s4u::Storage *res = NULL;
-       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)
-                       xbt_die("Storage %s does not exist. Please only use the storages that are defined in your platform.", name);
-
-               res = new Storage(name,inferior);
-       }
-       return *res;
+  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 == 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);
+  }
+  return *res;
 }
 
 const char*Storage::name() {
-       return p_name.c_str();
+  return name_.c_str();
 }
 
-sg_size_t Storage::size_free() {
-       return simcall_storage_get_free_size(p_inferior);
+sg_size_t Storage::sizeFree() {
+  return simcall_storage_get_free_size(pimpl_);
 }
-sg_size_t Storage::size_used() {
-       return simcall_storage_get_used_size(p_inferior);
+sg_size_t Storage::sizeUsed() {
+  return simcall_storage_get_used_size(pimpl_);
 }
 sg_size_t Storage::size() {
-       return SIMIX_storage_get_size(p_inferior);
+  return SIMIX_storage_get_size(pimpl_);
 }
 
 } /* namespace s4u */