X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be6e8d3215d3e25f48c7d2d0b359cf178f978d41..f9df6a0ce7023e4e22d83bb6c50f27bd21fab329:/src/bindings/java/JavaContext.hpp

diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index 564938803b..aa9094a3e7 100644
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -7,24 +7,27 @@
 #ifndef SIMGRID_JAVA_JAVA_CONTEXT_HPP
 #define SIMGRID_JAVA_JAVA_CONTEXT_HPP
 
+#include <functional>
+
 #include <jni.h>
 
 #include <xbt/misc.h>
 #include <simgrid/simix.h>
 #include <xbt/xbt_os_thread.h>
 
-#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_private.h"
 
 #include "jmsg.h"
 #include "jmsg_process.h"
 
 namespace simgrid {
-namespace java {
+namespace kernel {
+namespace context {
 
 class JavaContext;
 class JavacontextFactory;
 
-class JavaContext : public simgrid::simix::Context {
+class JavaContext : public simgrid::kernel::context::Context {
 public:
   // The java process instance bound with the msg process structure:
   jobject jprocess = nullptr;
@@ -48,7 +51,7 @@ private:
   static void* wrapper(void *data);
 };
 
-class JavaContextFactory : public simgrid::simix::ContextFactory {
+class JavaContextFactory : public simgrid::kernel::context::ContextFactory {
 public:
   JavaContextFactory();
   ~JavaContextFactory() override;
@@ -58,10 +61,9 @@ public:
   void run_all() override;
 };
 
-XBT_PRIVATE simgrid::simix::ContextFactory* java_factory();
+XBT_PRIVATE simgrid::kernel::context::ContextFactory* java_factory();
 XBT_PRIVATE void java_main_jprocess(jobject process);
 
-}
-}
+}}} // namespace simgrid::kernel::context
 
 #endif                          /* !_XBT_CONTEXT_JAVA_H */