Merge branch 'master' into adrien

[simgrid.git] / src / bindings / java / jmsg_host.h

diff --git a/src/bindings/java/jmsg_host.h b/src/bindings/java/jmsg_host.h
index 9f6ac0d..7c72bde 100644 (file)
--- a/src/bindings/java/jmsg_host.h
+++ b/src/bindings/java/jmsg_host.h
@@ -1,6 +1,6 @@
 /* Functions related to the java host instances.                            */
 
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -8,11 +8,11 @@
 #ifndef MSG_JHOST_H
 #define MSG_JHOST_H
 
-#include "simgrid/msg.h"
+#include "simgrid/host.h"
 #include "simgrid/plugins/file_system.h"
 #include <jni.h>
 
-SG_BEGIN_DECL()
+SG_BEGIN_DECL
 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT
@@ -33,10 +33,10 @@ jobject jhost_ref(JNIEnv * env, jobject jhost);
 void jhost_unref(JNIEnv * env, jobject jhost);
 
 /** Binds a native instance to a java instance. */
-void jhost_bind(jobject jhost, msg_host_t host, JNIEnv * env);
+void jhost_bind(jobject jhost, sg_host_t host, JNIEnv* env);
 
 /** Extracts the native instance associated to a java instance. */
-msg_host_t jhost_get_native(JNIEnv * env, jobject jhost);
+sg_host_t jhost_get_native(JNIEnv* env, jobject jhost);
 
 /** Initialize the native world, called from the Java world at startup */
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls);
@@ -73,5 +73,5 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getLoad(JNIEnv* env, jobject
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCurrentLoad(JNIEnv *env, jobject jhost);
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getAvgLoad(JNIEnv *env, jobject jhost);
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getComputedFlops (JNIEnv *env, jobject jhost);
-SG_END_DECL()
+SG_END_DECL
 #endif