Merge branch 'master' into adrien

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

diff --git a/src/bindings/java/jmsg_storage.h b/src/bindings/java/jmsg_storage.h
index b8bd820..d5e8a6b 100644 (file)
--- a/src/bindings/java/jmsg_storage.h
+++ b/src/bindings/java/jmsg_storage.h
@@ -1,6 +1,6 @@
 /* Java bindings of the Storage API.                                        */
 
-/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-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,19 +8,19 @@
 #ifndef MSG_JSTORAGE_H
 #define MSG_JSTORAGE_H
 
-#include "simgrid/msg.h"
+#include "simgrid/storage.h"
 #include <jni.h>
 
-SG_BEGIN_DECL()
+SG_BEGIN_DECL
 
 /** Returns a new java instance of a storage. */
 jobject jstorage_new_instance(JNIEnv * env);
 
 /** Binds a native instance to a java instance. */
-void jstorage_bind(jobject jstorage, msg_storage_t storage, JNIEnv * env);
+void jstorage_bind(jobject jstorage, sg_storage_t storage, JNIEnv* env);
 
 /** Extracts the native instance associated to a java instance. */
-msg_storage_t jstorage_get_native(JNIEnv * env, jobject jstorage);
+sg_storage_t jstorage_get_native(JNIEnv* env, jobject jstorage);
 
 /** Initialize the native world, called from the Java world at startup */
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Storage_nativeInit(JNIEnv *env, jclass cls);
@@ -31,9 +31,6 @@ jobject jstorage_ref(JNIEnv * env, jobject jstorage);
 /** Release a ref onto the java instance */
 void jstorage_unref(JNIEnv * env, jobject jstorage);
 
-/** Get the name of a java instance. */
-const char *jstorage_get_name(jobject jstorage, JNIEnv * env);
-
 /* Implement the Java API */
 
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv* env, jclass cls, jstring jname);
@@ -46,5 +43,5 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Storage_setProperty(JNIEnv* env, job
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage);
 JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv *env, jclass cls);
 
-SG_END_DECL()
-#endif                          /*!MSG_JSTORAGE_H */
+SG_END_DECL
+#endif