X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20b076334ae1f2b08b294022ed73aad39a7eb934..eecf563b3a3a0333dac9f754fe11f047c99cd27d:/src/surf/PropertyHolder.hpp

diff --git a/src/surf/PropertyHolder.hpp b/src/surf/PropertyHolder.hpp
index 2f9556304e..98e3b5b1a4 100644
--- a/src/surf/PropertyHolder.hpp
+++ b/src/surf/PropertyHolder.hpp
@@ -1,11 +1,12 @@
-/* Copyright (c) 2015. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2015-2018. 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. */
 
 #ifndef SRC_SURF_PROPERTYHOLDER_HPP_
 #define SRC_SURF_PROPERTYHOLDER_HPP_
-#include <xbt/dict.h>
+#include <map>
+#include <string>
 
 namespace simgrid {
 namespace surf {
@@ -17,18 +18,19 @@ namespace surf {
 class PropertyHolder { // DO NOT DERIVE THIS CLASS, or the diamond inheritance mayhem will get you
 
 public:
-	PropertyHolder(xbt_dict_t props);
-	~PropertyHolder();
+  PropertyHolder() = default;
+  ~PropertyHolder();
 
-	const char *getProperty(const char*id);
-	void setProperty(const char*id, const char*value);
+  const char* getProperty(std::string key);
+  void setProperty(std::string id, std::string value);
+
+  /* FIXME: This should not be exposed, as users may do bad things with the dict they got (it's not a copy).
+   * But some user API expose this call so removing it is not so easy.
+   */
+  std::map<std::string, std::string>* getProperties();
 
-	/* FIXME: This should not be exposed, as users may do bad things with the dict they got (it's not a copy).
-	 * But some user API expose this call so removing it is not so easy.
-	 */
-	xbt_dict_t getProperties();
 private:
-	xbt_dict_t p_properties = NULL;
+  std::map<std::string, std::string>* properties_ = nullptr;
 };
 
 } /* namespace surf */