Use namespace aliases instead of "using" directives.

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

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index dccd34a..e334a3e 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -84,7 +84,7 @@ void surf_network_model_init_Reno()
   if (surf_network_model)
     return;
 
-  using namespace simgrid::kernel;
+  namespace lmm = simgrid::kernel::lmm;
   lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi);
 
   simgrid::config::set_default<double>("network/latency-factor", 13.01);
@@ -101,7 +101,7 @@ void surf_network_model_init_Reno2()
   if (surf_network_model)
     return;
 
-  using namespace simgrid::kernel;
+  namespace lmm = simgrid::kernel::lmm;
   lmm::Lagrange::set_default_protocol_function(lmm::func_reno2_f, lmm::func_reno2_fp, lmm::func_reno2_fpi);
 
   simgrid::config::set_default<double>("network/latency-factor", 13.01);
@@ -117,7 +117,7 @@ void surf_network_model_init_Vegas()
   if (surf_network_model)
     return;
 
-  using namespace simgrid::kernel;
+  namespace lmm = simgrid::kernel::lmm;
   lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi);
 
   simgrid::config::set_default<double>("network/latency-factor", 13.01);
@@ -249,14 +249,14 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
   if (sg_weight_S_parameter > 0) {
     action->weight_ =
         std::accumulate(route.begin(), route.end(), action->weight_, [](double total, LinkImpl* const& link) {
-          return total + sg_weight_S_parameter / link->bandwidth();
+          return total + sg_weight_S_parameter / link->get_bandwidth();
         });
   }
 
-  double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->bandwidth();
+  double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->get_bandwidth();
 
   for (auto const& link : route)
-    bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->bandwidth());
+    bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->get_bandwidth());
 
   action->lat_current_ = action->latency_;
   action->latency_ *= latencyFactor(size);
@@ -330,14 +330,14 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)
 {
   /* Find out which of my iterators was triggered, and react accordingly */
   if (triggered == bandwidth_.event) {
-    setBandwidth(value);
+    set_bandwidth(value);
     tmgr_trace_event_unref(&bandwidth_.event);
 
   } else if (triggered == latency_.event) {
-    setLatency(value);
+    set_latency(value);
     tmgr_trace_event_unref(&latency_.event);
 
-  } else if (triggered == stateEvent_) {
+  } else if (triggered == state_event_) {
     if (value > 0)
       turn_on();
     else {
@@ -355,7 +355,7 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)
         }
       }
     }
-    tmgr_trace_event_unref(&stateEvent_);
+    tmgr_trace_event_unref(&state_event_);
   } else {
     xbt_die("Unknown event!\n");
   }
@@ -364,7 +364,7 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)
             get_constraint());
 }
 
-void NetworkCm02Link::setBandwidth(double value)
+void NetworkCm02Link::set_bandwidth(double value)
 {
   bandwidth_.peak = value;
 
@@ -389,7 +389,7 @@ void NetworkCm02Link::setBandwidth(double value)
   }
 }
 
-void NetworkCm02Link::setLatency(double value)
+void NetworkCm02Link::set_latency(double value)
 {
   double delta                 = value - latency_.peak;
   kernel::lmm::Variable* var   = nullptr;