- std::map<std::string, sg_size_t>* content = storage->content();
- xbt_dict_t content_dict = xbt_dict_new_homogeneous(nullptr);
-
- for (auto entry : *content) {
- xbt_dict_set(content_dict, entry.first.c_str(), (void*)entry.second, nullptr);
+ std::map<std::string, sg_size_t>* content = storage->getContent();
+ // Note: ::operator delete is ok here (no destructor called) since the dict elements are of POD type sg_size_t.
+ xbt_dict_t content_as_dict = xbt_dict_new_homogeneous(::operator delete);
+
+ for (auto const& entry : *content) {
+ sg_size_t* psize = new sg_size_t;
+ *psize = entry.second;
+ xbt_dict_set(content_as_dict, entry.first.c_str(), psize, nullptr);