Kill useless typedefs const_lmm_element_t and lmm_constraint_light_t.

[simgrid.git] / src / surf / storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 03b1cff407270701b819d71da93a23b64d24fdca..b2059f1b74f19732e0a18c97e4eb7eb41d1d4d3e 100644 (file)
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -24,7 +24,7 @@ static void check_disk_attachment()
   for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) {
     simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str());
     if (not host_elm)
-      surf_parse_error(std::string("Unable to attach storage ") + s->getCname() + ": host " +
+      surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +
                        s->getImpl()->getHost().c_str() + " does not exist.");
     else
       s->attached_to_ = sg_host_by_name(s->getImpl()->getHost().c_str());
@@ -106,12 +106,12 @@ StorageN11::StorageN11(StorageModel* model, std::string name, kernel::lmm::Syste
 
 StorageAction* StorageN11::read(sg_size_t size)
 {
-  return new StorageN11Action(model(), size, isOff(), this, READ);
+  return new StorageN11Action(get_model(), size, is_off(), this, READ);
 }
 
 StorageAction* StorageN11::write(sg_size_t size)
 {
-  return new StorageN11Action(model(), size, isOff(), this, WRITE);
+  return new StorageN11Action(get_model(), size, is_off(), this, WRITE);
 }
 
 /**********
@@ -122,10 +122,10 @@ StorageN11Action::StorageN11Action(kernel::resource::Model* model, double cost,
                                    e_surf_action_storage_type_t type)
     : StorageAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), storage, type)
 {
-  XBT_IN("(%s,%g", storage->getCname(), cost);
+  XBT_IN("(%s,%g", storage->get_cname(), cost);
 
   // Must be less than the max bandwidth for all actions
-  model->get_maxmin_system()->expand(storage->constraint(), get_variable(), 1.0);
+  model->get_maxmin_system()->expand(storage->get_constraint(), get_variable(), 1.0);
   switch(type) {
   case READ:
     model->get_maxmin_system()->expand(storage->constraintRead_, get_variable(), 1.0);