Sonar: move extern "C" declarations out of namespaces.

diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp
index 13586a6..69a2a5b 100644 (file)
--- a/src/mc/mc_snapshot.cpp
+++ b/src/mc/mc_snapshot.cpp
@@ -156,6 +156,8 @@ int MC_snapshot_memcmp(
   return MC_snapshot_region_memcmp(addr1, region1, addr2, region2, size);
 }
 
   return MC_snapshot_region_memcmp(addr1, region1, addr2, region2, size);
 }
 

+} // extern "C"
+

 namespace simgrid {
 namespace mc {
 
 namespace simgrid {
 namespace mc {
 


@@ -192,8 +194,6 @@ const void* Snapshot::read_bytes(void* buffer, std::size_t size,
 }
 }
 
 }
 }
 

-}
-

 #ifdef SIMGRID_TEST
 
 #include <cstdlib>
 #ifdef SIMGRID_TEST
 
 #include <cstdlib>

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index f815594..aa60f1e 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -8,6 +8,8 @@
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_host_private.hpp"
 
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_host_private.hpp"
 

+#include <xbt/asserts.h> // xbt_log_no_loc
+

 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module");
 
 simgrid::vm::VMModel* surf_vm_model = nullptr;
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module");
 
 simgrid::vm::VMModel* surf_vm_model = nullptr;


@@ -128,8 +130,6 @@ VirtualMachineImpl::VirtualMachineImpl(simgrid::s4u::VirtualMachine* piface, sim
   XBT_VERB("Create VM(%s)@PM(%s)", piface->getCname(), hostPM_->getCname());
 }
 
   XBT_VERB("Create VM(%s)@PM(%s)", piface->getCname(), hostPM_->getCname());
 }
 

-extern "C" int
-    xbt_log_no_loc; /* ugly pimpl to ensure that the debug info in the known issue below don't break the test */

 /** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */
 VirtualMachineImpl::~VirtualMachineImpl()
 {
 /** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */
 VirtualMachineImpl::~VirtualMachineImpl()
 {