A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
track all the useless void
[simgrid.git]
/
src
/
bindings
/
java
/
JavaContext.hpp
diff --git
a/src/bindings/java/JavaContext.hpp
b/src/bindings/java/JavaContext.hpp
index
5649388
..
aa9094a
100644
(file)
--- 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
#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 <jni.h>
#include <xbt/misc.h>
#include <simgrid/simix.h>
#include <xbt/xbt_os_thread.h>
-#include "src/simix/smx_private.h
pp
"
+#include "src/simix/smx_private.h"
#include "jmsg.h"
#include "jmsg_process.h"
namespace simgrid {
#include "jmsg.h"
#include "jmsg_process.h"
namespace simgrid {
-namespace java {
+namespace kernel {
+namespace context {
class JavaContext;
class JavacontextFactory;
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;
public:
// The java process instance bound with the msg process structure:
jobject jprocess = nullptr;
@@
-48,7
+51,7
@@
private:
static void* wrapper(void *data);
};
static void* wrapper(void *data);
};
-class JavaContextFactory : public simgrid::
simix
::ContextFactory {
+class JavaContextFactory : public simgrid::
kernel::context
::ContextFactory {
public:
JavaContextFactory();
~JavaContextFactory() override;
public:
JavaContextFactory();
~JavaContextFactory() override;
@@
-58,10
+61,9
@@
public:
void run_all() override;
};
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);
XBT_PRIVATE void java_main_jprocess(jobject process);
-}
-}
+}}} // namespace simgrid::kernel::context
#endif /* !_XBT_CONTEXT_JAVA_H */
#endif /* !_XBT_CONTEXT_JAVA_H */