X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eadbe829389f23151f79257824f3164d7801bbc7..5edbea104d3c5d61dc5a6dce20706a6fe5c89b2a:/src/s4u/s4u_Storage.cpp diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp index 0be7985d0f..59667fdd4a 100644 --- a/src/s4u/s4u_Storage.cpp +++ b/src/s4u/s4u_Storage.cpp @@ -41,19 +41,19 @@ const char* Storage::get_type() return pimpl_->typeId_.c_str(); } -std::unordered_map* Storage::get_properties() +const std::unordered_map* Storage::get_properties() const { - return simix::simcall([this] { return pimpl_->get_properties(); }); + return pimpl_->get_properties(); } -const char* Storage::get_property(const std::string& key) +const char* Storage::get_property(const std::string& key) const { return this->pimpl_->get_property(key); } void Storage::set_property(const std::string& key, const std::string& value) { - simix::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); + kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); } IoPtr Storage::io_init(sg_size_t size, Io::OpType type) @@ -118,11 +118,11 @@ xbt_dict_t sg_storage_get_properties(sg_storage_t storage) { xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)"); xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); - std::unordered_map* props = storage->get_properties(); + const std::unordered_map* props = storage->get_properties(); if (props == nullptr) return nullptr; for (auto const& elm : *props) { - xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr); + xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str())); } return as_dict; }