Remove spurious "using" declarations.

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index aef3f31..796aae4 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -22,8 +22,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
 
 ::simgrid::mc::ModelChecker* mc_model_checker = nullptr;
 
-using simgrid::mc::remote;
-
 #ifdef __linux__
 # define WAITPID_CHECKED_FLAGS __WALL
 #else

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index 161135d..68d7517 100644 (file)
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -11,8 +11,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC states");
 
-using simgrid::mc::remote;
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index bbec79b..54190db 100644 (file)
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -13,8 +13,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc, "Logging specific to mc_compare in mc");
 
-using simgrid::mc::remote;
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/mc/inspect/DwarfExpression.cpp b/src/mc/inspect/DwarfExpression.cpp
index 0963f8a..6f765c4 100644 (file)
--- a/src/mc/inspect/DwarfExpression.cpp
+++ b/src/mc/inspect/DwarfExpression.cpp
@@ -15,8 +15,6 @@
 #include "src/mc/inspect/mc_dwarf.hpp"
 #include "src/mc/mc_private.hpp"
 
-using simgrid::mc::remote;
-
 namespace simgrid {
 namespace dwarf {
 
@@ -155,7 +153,7 @@ void execute(const Dwarf_Op* ops, std::size_t n, const ExpressionContext& contex
         // Computed address:
         if (not context.address_space)
           throw evaluation_error("Missing address space");
-        context.address_space->read_bytes(&stack.top(), sizeof(uintptr_t), remote(stack.top()));
+        context.address_space->read_bytes(&stack.top(), sizeof(uintptr_t), mc::remote(stack.top()));
         break;
 
       default:
@@ -169,7 +167,7 @@ void execute(const Dwarf_Op* ops, std::size_t n, const ExpressionContext& contex
                  DW_OP_breg28, DW_OP_breg29, DW_OP_breg30, DW_OP_breg31};
             registers.count(atom) > 0) {
           // Push register + constant:
-          int register_id = simgrid::dwarf::dwarf_register_to_libunwind(op->atom - DW_OP_breg0);
+          int register_id = dwarf_register_to_libunwind(op->atom - DW_OP_breg0);
           unw_word_t res;
           if (not context.cursor)
             throw evaluation_error("Missing stack context");

diff --git a/src/mc/inspect/mc_unw.cpp b/src/mc/inspect/mc_unw.cpp
index 753c948..97e9a53 100644 (file)
--- a/src/mc/inspect/mc_unw.cpp
+++ b/src/mc/inspect/mc_unw.cpp
@@ -25,8 +25,6 @@ typedef register_t greg_t;
 
 #include <libunwind.h>
 
-using simgrid::mc::remote;
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 1631cd2..ad173e5 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -18,8 +18,6 @@
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/Session.hpp"
 #include "src/mc/remote/RemoteProcess.hpp"
-
-using simgrid::mc::remote;
 #endif
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(mc, "All MC categories");

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index dd88147..344212f 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -8,7 +8,6 @@
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/remote/RemoteProcess.hpp"
 
-using simgrid::mc::remote;
 /** @file
  *  @brief (Cross-process, MCer/MCed) Access to SMX structures
  *
@@ -49,7 +48,7 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProces
     simgrid::mc::ActorInformation info;
 
     info.address  = simgrid::mc::RemotePtr<simgrid::kernel::actor::ActorImpl>(data[i]);
-    process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i]));
+    process->read_bytes(&info.copy, sizeof(info.copy), simgrid::mc::remote(data[i]));
     target.push_back(std::move(info));
   }
   ::operator delete(data);

diff --git a/src/mc/remote/RemoteProcess.cpp b/src/mc/remote/RemoteProcess.cpp
index bf2fe5b..cb574a5 100644 (file)
--- a/src/mc/remote/RemoteProcess.cpp
+++ b/src/mc/remote/RemoteProcess.cpp
@@ -23,8 +23,6 @@
 #include <string>
 #include <string_view>
 
-using simgrid::mc::remote;
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc, "MC process information");
 
 namespace simgrid {