X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a92d7b716f51a53dea7f59db8524d4add713b910..ebc355d0c96552d0bc2aa301d90723490337bca3:/src/surf/PropertyHolder.cpp

diff --git a/src/surf/PropertyHolder.cpp b/src/surf/PropertyHolder.cpp
index 2eda708ce0..39be42b685 100644
--- a/src/surf/PropertyHolder.cpp
+++ b/src/surf/PropertyHolder.cpp
@@ -1,38 +1,39 @@
-/* Copyright (c) 2015. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "xbt/sysdep.h"
 #include "PropertyHolder.hpp"
 
 namespace simgrid {
 namespace surf {
 
-PropertyHolder::PropertyHolder() = default;
-
 PropertyHolder::~PropertyHolder() {
-  xbt_dict_free(&properties_);
+  delete properties_;
 }
 
 /** @brief Return the property associated to the provided key (or nullptr if not existing) */
-const char *PropertyHolder::getProperty(const char*key) {
+const char* PropertyHolder::get_property(const std::string& key)
+{
   if (properties_ == nullptr)
     return nullptr;
-  return static_cast<const char*>(xbt_dict_get_or_null(properties_,key));
+  auto prop = properties_->find(key);
+  return prop == properties_->end() ? nullptr : prop->second.c_str();
 }
 
 /** @brief Change the value of a given key in the property set */
-void PropertyHolder::setProperty(const char*key, const char*value) {
+void PropertyHolder::set_property(const std::string& key, const std::string& value)
+{
   if (not properties_)
-    properties_ = xbt_dict_new_homogeneous(xbt_free_f);
-  xbt_dict_set(properties_, key, xbt_strdup(value), nullptr);
+    properties_ = new std::unordered_map<std::string, std::string>;
+  (*properties_)[key] = value;
 }
 
 /** @brief Return the whole set of properties. Don't mess with it, dude! */
-xbt_dict_t PropertyHolder::getProperties() {
+std::unordered_map<std::string, std::string>* PropertyHolder::get_properties()
+{
   if (not properties_)
-    properties_ = xbt_dict_new_homogeneous(xbt_free_f);
+    properties_ = new std::unordered_map<std::string, std::string>;
   return properties_;
 }