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

diff --git a/src/surf/PropertyHolder.cpp b/src/surf/PropertyHolder.cpp
index 4458b2d8db..2eda708ce0 100644
--- a/src/surf/PropertyHolder.cpp
+++ b/src/surf/PropertyHolder.cpp
@@ -9,34 +9,31 @@
 namespace simgrid {
 namespace surf {
 
-PropertyHolder::PropertyHolder(xbt_dict_t props)
-: p_properties(props)
-{
-}
+PropertyHolder::PropertyHolder() = default;
 
 PropertyHolder::~PropertyHolder() {
-  xbt_dict_free(&p_properties);
+  xbt_dict_free(&properties_);
 }
 
-/** @brief Return the property associated to the provided key (or NULL if not existing) */
+/** @brief Return the property associated to the provided key (or nullptr if not existing) */
 const char *PropertyHolder::getProperty(const char*key) {
-  if (p_properties == NULL)
-    return NULL;
-  return (const char*) xbt_dict_get_or_null(p_properties,key);
+  if (properties_ == nullptr)
+    return nullptr;
+  return static_cast<const char*>(xbt_dict_get_or_null(properties_,key));
 }
 
 /** @brief Change the value of a given key in the property set */
 void PropertyHolder::setProperty(const char*key, const char*value) {
-  if (!p_properties)
-    p_properties = xbt_dict_new();
-  xbt_dict_set(p_properties, key, xbt_strdup(value), &xbt_free_f);
+  if (not properties_)
+    properties_ = xbt_dict_new_homogeneous(xbt_free_f);
+  xbt_dict_set(properties_, key, xbt_strdup(value), nullptr);
 }
 
 /** @brief Return the whole set of properties. Don't mess with it, dude! */
 xbt_dict_t PropertyHolder::getProperties() {
-  if (!p_properties)
-    p_properties = xbt_dict_new();
-  return p_properties;
+  if (not properties_)
+    properties_ = xbt_dict_new_homogeneous(xbt_free_f);
+  return properties_;
 }
 
 } /* namespace surf */