Use 'using-declarations' to inherit constructors.

[simgrid.git] / src / kernel / lmm / maxmin.cpp

diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp
index 3dd1bb67f21936547f85bc941b71a98f7b4eef76..b78013167b8956ad7fcbd68ee709f5c62ee220f2 100644 (file)
--- a/src/kernel/lmm/maxmin.cpp
+++ b/src/kernel/lmm/maxmin.cpp
@@ -16,7 +16,7 @@ namespace simgrid {
 namespace kernel {
 namespace lmm {
 
-typedef std::vector<int> dyn_light_t;
+using dyn_light_t = std::vector<int>;
 
 int Variable::next_rank_   = 1;
 int Constraint::next_rank_ = 1;
@@ -175,7 +175,7 @@ Constraint::Constraint(resource::Resource* id_value, double bound_value) : bound
 
 Constraint* System::constraint_new(resource::Resource* id, double bound_value)
 {
-  Constraint* cnst = new Constraint(id, bound_value);
+  auto* cnst = new Constraint(id, bound_value);
   insert_constraint(cnst);
   return cnst;
 }
@@ -195,7 +195,7 @@ Variable* System::variable_new(resource::Action* id, double sharing_penalty, dou
   XBT_IN("(sys=%p, id=%p, penalty=%f, bound=%f, num_cons =%zu)", this, id, sharing_penalty, bound,
          number_of_constraints);
 
-  Variable* var = static_cast<Variable*>(xbt_mallocator_get(variable_mallocator_));
+  auto* var = static_cast<Variable*>(xbt_mallocator_get(variable_mallocator_));
   var->initialize(id, sharing_penalty, bound, number_of_constraints, visited_counter_ - 1);
   if (sharing_penalty > 0)
     variable_set.push_front(*var);
@@ -428,7 +428,7 @@ static void format_element_list(const ElemList& elem_list, s4u::Link::SharingPol
 
 void System::print() const
 {
-  std::string buf = std::string("MAX-MIN ( ");
+  std::string buf = "MAX-MIN ( ";
 
   /* Printing Objective */
   for (Variable const& var : variable_set)
@@ -645,8 +645,7 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
     min_usage = -1;
     min_bound = -1;
     saturated_constraints.clear();
-    int pos;
-    for (pos = 0; pos < cnst_light_num; pos++) {
+    for (int pos = 0; pos < cnst_light_num; pos++) {
       xbt_assert(not cnst_light_tab[pos].cnst->active_element_set_.empty(),
                  "Cannot saturate more a constraint that has"
                  " no active element! You may want to change the maxmin precision (--cfg=maxmin/precision:<new_value>)"