X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/290296c62f5642c1d74a9c902a57ab72ac230f1e..4e1034f2699881431dbd65b0d4d1af6131a60302:/src/s4u/s4u_storage.cpp diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp index 3890ce3c90..6dd8fe9dcb 100644 --- a/src/s4u/s4u_storage.cpp +++ b/src/s4u/s4u_storage.cpp @@ -16,7 +16,7 @@ std::map* allStorages() { std::unordered_map* map = surf::StorageImpl::storagesMap(); std::map* res = new std::map; - for (auto s : *map) + for (auto const& s : *map) res->insert({s.first, &(s.second->piface_)}); // Convert each entry into its interface return res; @@ -30,9 +30,14 @@ Storage* Storage::byName(std::string name) return &res->piface_; } -const char* Storage::getName() +const std::string& Storage::getName() const { - return pimpl_->cname(); + return pimpl_->getName(); +} + +const char* Storage::getCname() const +{ + return pimpl_->getCname(); } const char* Storage::getType() @@ -65,12 +70,12 @@ std::map* Storage::getProperties() return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); }); } -const char* Storage::getProperty(const char* key) +const char* Storage::getProperty(std::string key) { return this->pimpl_->getProperty(key); } -void Storage::setProperty(const char* key, const char* value) +void Storage::setProperty(std::string key, std::string value) { simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); }); }