the property holder does not take a dict in its constructor

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index f745663..576c6bd 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -98,7 +98,7 @@ Action* HostModel::executeParallelTask(int host_nb, simgrid::s4u::Host** host_li
 /************
  * Resource *
  ************/
-HostImpl::HostImpl(s4u::Host* host, xbt_dynar_t storage) : PropertyHolder(nullptr), storage_(storage), piface_(host)
+HostImpl::HostImpl(s4u::Host* host, xbt_dynar_t storage) : storage_(storage), piface_(host)
 {
   piface_->pimpl_ = this;
 }

diff --git a/src/surf/PropertyHolder.cpp b/src/surf/PropertyHolder.cpp
index b57e536..53f09d5 100644 (file)
--- a/src/surf/PropertyHolder.cpp
+++ b/src/surf/PropertyHolder.cpp
@@ -9,10 +9,7 @@
 namespace simgrid {
 namespace surf {
 
-PropertyHolder::PropertyHolder(xbt_dict_t props)
-: properties_(props)
-{
-}
+PropertyHolder::PropertyHolder() = default;
 
 PropertyHolder::~PropertyHolder() {
   xbt_dict_free(&properties_);

diff --git a/src/surf/PropertyHolder.hpp b/src/surf/PropertyHolder.hpp
index e7da433..ba06640 100644 (file)
--- a/src/surf/PropertyHolder.hpp
+++ b/src/surf/PropertyHolder.hpp
@@ -17,7 +17,7 @@ namespace surf {
 class PropertyHolder { // DO NOT DERIVE THIS CLASS, or the diamond inheritance mayhem will get you
 
 public:
-  explicit PropertyHolder(xbt_dict_t props);
+  explicit PropertyHolder();
   ~PropertyHolder();
 
   const char *getProperty(const char*id);

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 89819e1..5a2e56d 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -148,7 +148,7 @@ namespace simgrid {
      ************/
 
     Link::Link(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint)
-        : Resource(model, name, constraint), PropertyHolder(nullptr)
+        : Resource(model, name, constraint)
     {
       if (strcmp(name,"__loopback__"))
         xbt_assert(!Link::byName(name), "Link '%s' declared several times in the platform.", name);

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 26fd112..ff31c4c 100644 (file)
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -53,7 +53,6 @@ Storage::Storage(Model* model, const char* name, lmm_system_t maxminSystem, doub
                  double bconnection, const char* type_id, const char* content_name, const char* content_type,
                  sg_size_t size, const char* attach)
     : Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection))
-    , PropertyHolder(nullptr)
     , contentType_(xbt_strdup(content_type))
     , size_(size)
     , usedSize_(0)