merge xbt/ex.hpp into simgrid/exception.hpp

[simgrid.git] / src / bindings / java / jmsg_process.cpp

diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp
index 8b49a90..fc5444c 100644 (file)
--- a/src/bindings/java/jmsg_process.cpp
+++ b/src/bindings/java/jmsg_process.cpp
@@ -5,7 +5,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <xbt/ex.hpp>
+#include "simgrid/exception.hpp"
 
 #include "jmsg_process.h"
 
@@ -25,7 +25,8 @@ jfieldID jprocess_field_Process_ppid;
 
 jobject jprocess_from_native(msg_process_t process)
 {
-  simgrid::kernel::context::JavaContext* context = (simgrid::kernel::context::JavaContext*)process->get_impl()->context;
+  simgrid::kernel::context::JavaContext* context =
+      (simgrid::kernel::context::JavaContext*)process->get_impl()->context_;
   return context->jprocess;
 }
 
@@ -101,9 +102,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_daemonize(JNIEnv* env, jobje
   process->daemonize();
 }
 
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv* env, jclass cls)
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv* env, jclass cls)
 {
-  return (jint)MSG_process_killall();
+  MSG_process_killall();
 }
 
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jint pid)