X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..3a2451e6d3940d00410f537a275f3e3a8db134d7:/src/surf/PropertyHolder.hpp

diff --git a/src/surf/PropertyHolder.hpp b/src/surf/PropertyHolder.hpp
index 0684173fa6..2c7cdceedf 100644
--- a/src/surf/PropertyHolder.hpp
+++ b/src/surf/PropertyHolder.hpp
@@ -1,11 +1,14 @@
-/* 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. */
 
 #ifndef SRC_SURF_PROPERTYHOLDER_HPP_
 #define SRC_SURF_PROPERTYHOLDER_HPP_
-#include <xbt/dict.h>
+
+#include <memory>
+#include <string>
+#include <unordered_map>
 
 namespace simgrid {
 namespace surf {
@@ -17,18 +20,18 @@ 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 PropertyHolder&) = delete;
+  PropertyHolder& operator=(const PropertyHolder&) = delete;
+
+  const char* get_property(const std::string& key) const;
+  void set_property(const std::string& id, const std::string& value);
 
-  const char *getProperty(const char*id);
-  void setProperty(const char*id, const char*value);
+  const std::unordered_map<std::string, std::string>* get_properties();
+  template <class Assoc> void set_properties(const Assoc& properties);
 
-  /* 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::unique_ptr<std::unordered_map<std::string, std::string>> properties_ = nullptr;
 };
 
 } /* namespace surf */