X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c9309ca5ce7b71208ec162d803972feabe4e42da..07eb08dd092e89871ab3ed9fcf41ad0219598e3b:/src/surf/network_interface.cpp diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index c52c44342c..86202a2562 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -67,11 +67,7 @@ simgrid::surf::NetworkModel *surf_network_model = nullptr; namespace simgrid { namespace surf { - NetworkModel::~NetworkModel() - { - delete maxminSystem_; - delete modifiedSet_; - } + NetworkModel::~NetworkModel() = default; double NetworkModel::latencyFactor(double /*size*/) { return sg_latency_factor; @@ -104,7 +100,7 @@ namespace simgrid { * Resource * ************/ - LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, lmm_constraint_t constraint) + LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::lmm::Constraint* constraint) : Resource(model, name, constraint), piface_(this) { @@ -206,7 +202,8 @@ namespace simgrid { for (int i = 0; i < llen; i++) { /* Beware of composite actions: ptasks put links and cpus together */ // extra pb: we cannot dynamic_cast from void*... - Resource* resource = static_cast(getVariable()->get_constraint(i)->get_id()); + kernel::model::Resource* resource = + static_cast(getVariable()->get_constraint(i)->get_id()); LinkImpl* link = dynamic_cast(resource); if (link != nullptr) retlist.push_back(link);