Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Sonar const's...
[simgrid.git] / src / kernel / lmm / maxmin.cpp
index bd13a0a405d863a16596b0a5262871cd09a14601..33b84a93f4a18306713c493eb7f12c80e9457866 100644 (file)
@@ -141,16 +141,13 @@ System::System(bool selective_update) : selective_update_active(selective_update
 
 System::~System()
 {
-  Variable* var;
-  Constraint* cnst;
-
-  while ((var = extract_variable())) {
+  while (Variable* var = extract_variable()) {
     std::string demangled = boost::core::demangle(var->id_ ? typeid(*var->id_).name() : "(unidentified)");
     XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.c_str(),
              var->rank_);
     var_free(var);
   }
-  while ((cnst = extract_constraint()))
+  while (Constraint* cnst = extract_constraint())
     cnst_free(cnst);
 
   xbt_mallocator_free(variable_mallocator_);
@@ -208,8 +205,7 @@ void System::variable_free(Variable* var)
 
 void System::variable_free_all()
 {
-  Variable* var;
-  while ((var = extract_variable()))
+  while (Variable* var = extract_variable())
     variable_free(var);
 }
 
@@ -240,7 +236,7 @@ void System::expand(Constraint* cnst, Variable* var, double consumption_weight)
 
   xbt_assert(var->cnsts_.size() < var->cnsts_.capacity(), "Too much constraints");
 
-  var->cnsts_.resize(var->cnsts_.size() + 1);
+  var->cnsts_.emplace_back();
   Element& elem = var->cnsts_.back();
 
   elem.consumption_weight = consumption_weight;