track all the useless void

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

diff --git a/src/bindings/java/jmsg.h b/src/bindings/java/jmsg.h
index da2b16f..deba4ac 100644 (file)
--- a/src/bindings/java/jmsg.h
+++ b/src/bindings/java/jmsg.h
@@ -1,6 +1,6 @@
 /* Java Wrappers to the MSG API.                                            */
 
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,64 +8,53 @@
 
 #ifndef MSG4JAVA_H
 #define MSG4JAVA_H
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 #include <jni.h>
 
-extern int JAVA_HOST_LEVEL;
-extern xbt_lib_t host_lib;
+SG_BEGIN_DECL()
 
+extern int JAVA_HOST_LEVEL;
 extern int JAVA_STORAGE_LEVEL;
-extern xbt_lib_t storage_lib;
 
-JavaVM *get_java_VM(void);
-JNIEnv *get_current_thread_env(void);
+JavaVM *get_java_VM();
+JNIEnv *get_current_thread_env();
 /**
- * This function throws the correct exception according to the status
- * provided.
+ * This function throws the correct exception according to the status provided.
  */
 void jmsg_throw_status(JNIEnv *env, msg_error_t status);
 
 /*
- * Class               org_simgrid_msg_Msg
- * Method              getClock
- * Signature   ()D
+ * Class    org_simgrid_msg_Msg
+ * Method    getClock
+ * Signature  ()D
  */
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Msg_getClock(JNIEnv *, jclass);
+
 /**
- * Class               org_simgrid_msg_Msg
- * Method              run
+ * Class    org_simgrid_msg_Msg
+ * Method    run
  */
-JNIEXPORT void JNICALL
-    JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls);
+JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls);
+
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs);
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit();
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv *, jclass,
-                                                 jstring);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv *, jclass, jstring);
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
-                                       jstring jplatformFile);
-JNIEXPORT jobject JNICALL
-Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls);
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
-                                       jstring jdeploymentFile);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile);
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jdeploymentFile);
 
+SG_END_DECL()
 #endif                          /* !MSG4JAVA_H */