less calls to simix.h + cosmetics

diff --git a/include/simgrid/s4u/Semaphore.hpp b/include/simgrid/s4u/Semaphore.hpp
index 8520d61..d3e2c58 100644 (file)
--- a/include/simgrid/s4u/Semaphore.hpp
+++ b/include/simgrid/s4u/Semaphore.hpp
@@ -7,7 +7,6 @@
 #define SIMGRID_S4U_SEMAPHORE_HPP
 
 #include <simgrid/forward.h>
-#include <simgrid/simix.h>
 
 namespace simgrid {
 namespace s4u {

diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index 938819d..70873a5 100644 (file)
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -11,7 +11,6 @@
 #include <functional>
 #include <jni.h>
 
-#include "simgrid/simix.h"
 #include "src/kernel/context/ContextThread.hpp"
 
 #include "jmsg.hpp"
@@ -23,7 +22,7 @@ namespace context {
 class JavaContext;
 class JavacontextFactory;
 
-class JavaContext : public simgrid::kernel::context::SerialThreadContext {
+class JavaContext : public SerialThreadContext {
 public:
   // The java process instance bound with the msg process structure:
   jobject jprocess_ = nullptr;
@@ -31,13 +30,13 @@ public:
   JNIEnv* jenv_           = nullptr;
 
   friend class JavaContextFactory;
-  JavaContext(std::function<void()>&& code, smx_actor_t actor);
+  JavaContext(std::function<void()>&& code, actor::ActorImpl* actor);
 
   void start_hook() override;
   void stop_hook() override;
 };
 
-class JavaContextFactory : public simgrid::kernel::context::ContextFactory {
+class JavaContextFactory : public ContextFactory {
 public:
   JavaContextFactory();
   ~JavaContextFactory() override;
@@ -45,9 +44,11 @@ public:
   void run_all() override;
 };
 
-XBT_PRIVATE simgrid::kernel::context::ContextFactory* java_factory();
+XBT_PRIVATE ContextFactory* java_factory();
 XBT_PRIVATE void java_main_jprocess(jobject process);
 
-}}} // namespace simgrid::kernel::context
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
 
 #endif /* SIMGRID_JAVA_JAVA_CONTEXT_HPP */

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 70d99fa..010838b 100644 (file)
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -14,7 +14,6 @@
 #include "simgrid/plugins/file_system.h"
 #include "simgrid/plugins/live_migration.h"
 #include "simgrid/plugins/load.h"
-#include "simgrid/simix.h"
 
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Host.hpp"

diff --git a/src/kernel/timer/Timer.cpp b/src/kernel/timer/Timer.cpp
index c0f475f..f9d85e7 100644 (file)
--- a/src/kernel/timer/Timer.cpp
+++ b/src/kernel/timer/Timer.cpp
@@ -6,7 +6,6 @@
 
 #include <simgrid/kernel/Timer.hpp>
 #include <simgrid/s4u/Engine.hpp>
-#include <simgrid/simix.h>
 
 namespace simgrid {
 namespace kernel {