please sonar

[simgrid.git] / src / simix / smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 0c08be8..85d2dfa 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -7,34 +7,7 @@
 #ifndef _SIMIX_PRIVATE_H
 #define _SIMIX_PRIVATE_H
 
-#include <functional>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
-#include <xbt/functional.hpp>
-
-#include "src/internal_config.h"
-#include "simgrid/simix.h"
-#include "surf/surf.h"
-#include "xbt/base.h"
-#include "xbt/fifo.h"
-#include "xbt/swag.h"
-#include "xbt/dict.h"
-#include "xbt/mallocator.h"
-#include "xbt/config.h"
-#include "xbt/xbt_os_time.h"
-#include "xbt/function_types.h"
-#include "src/xbt/ex_interface.h"
-#include "src/instr/instr_private.h"
-#include "smx_host_private.h"
-#include "smx_io_private.h"
-#include "smx_network_private.h"
-#include "popping_private.h"
-#include "smx_synchro_private.h"
-
 #include <signal.h>
-#include "src/simix/ActorImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 
 /********************************** Simix Global ******************************/
@@ -49,7 +22,7 @@ public:
   xbt_dynar_t process_that_ran = nullptr;
   xbt_swag_t process_list = nullptr;
   xbt_swag_t process_to_destroy = nullptr;
-  smx_process_t maestro_process = nullptr;
+  smx_actor_t maestro_process = nullptr;
 
   // Maps function names to actor code:
   std::unordered_map<std::string, simgrid::simix::ActorCodeFactory> registered_functions;
@@ -80,7 +53,7 @@ XBT_PUBLIC(void) SIMIX_clean();
 /** @brief Ask to the provided simix process to raise the provided exception */
 #define SMX_EXCEPTION(issuer, cat, val, msg) \
   if (1) { \
-  smx_process_t _smx_throw_issuer = (issuer); /* evaluate only once */ \
+  smx_actor_t _smx_throw_issuer = (issuer); /* evaluate only once */ \
   xbt_ex e(XBT_THROW_POINT, msg); \
   e.category = cat; \
   e.value = val; \