From 94c06d66c9765753ae93968cdbd2ca5e0eb73b6d Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 25 Jun 2018 22:28:02 +0200 Subject: [PATCH] Use namespace aliases instead of "using" directives. --- src/surf/network_cm02.cpp | 6 +++--- teshsuite/surf/lmm_usage/lmm_usage.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 4ee72d2e9b..e334a3e5a6 100644 --- 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("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("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("network/latency-factor", 13.01); diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/surf/lmm_usage/lmm_usage.cpp index 8b2d01c336..c66a43c1f8 100644 --- a/teshsuite/surf/lmm_usage/lmm_usage.cpp +++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp @@ -16,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); -using namespace simgrid::kernel; +namespace lmm = simgrid::kernel::lmm; #define PRINT_VAR(var) XBT_DEBUG(#var " = %g", (var)->get_value()) #define SHOW_EXPR(expr) XBT_DEBUG(#expr " = %g",expr) -- 2.20.1