X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..b9625f82f86db0674e911887addce45dca31b57f:/src/bindings/java/jxbt_utilities.hpp

diff --git a/src/bindings/java/jxbt_utilities.hpp b/src/bindings/java/jxbt_utilities.hpp
index e496893d53..3a157341da 100644
--- a/src/bindings/java/jxbt_utilities.hpp
+++ b/src/bindings/java/jxbt_utilities.hpp
@@ -1,6 +1,6 @@
 /* Various JNI helper functions                                             */
 
-/* Copyright (c) 2007-2017. 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. */
@@ -12,8 +12,6 @@
 #include <jni.h>
 #include <string>
 
-extern "C" {
-
 /* Search a class and throw an exception if not found */
 jclass jxbt_get_class(JNIEnv* env, const char* name);
 
@@ -37,43 +35,43 @@ jfieldID jxbt_get_sfield(JNIEnv* env, const char* classname, const char* name, c
 
 #define jxbt_check_res(fun, res, allowed_exceptions, detail)                                                           \
   do {                                                                                                                 \
-    if (res != MSG_OK && (res | allowed_exceptions)) {                                                                 \
-      xbt_die("%s failed with error code %d, which is not an allowed exception. Please fix me.", fun, res);            \
-    } else if (res == MSG_HOST_FAILURE) {                                                                              \
-      jxbt_throw_host_failure(env, detail);                                                                            \
-    } else if (res == MSG_TRANSFER_FAILURE) {                                                                          \
-      jxbt_throw_transfer_failure(env, detail);                                                                        \
-    } else if (res == MSG_TIMEOUT) {                                                                                   \
-      jxbt_throw_time_out_failure(env, detail);                                                                        \
-    } else if (res == MSG_TASK_CANCELED) {                                                                             \
-      jxbt_throw_task_cancelled(env, detail);                                                                          \
+    if ((res) != MSG_OK && ((res) | (allowed_exceptions))) {                                                           \
+      xbt_die("%s failed with error code %d, which is not an allowed exception. Please fix me.", (fun), (res));        \
+    } else if ((res) == MSG_HOST_FAILURE) {                                                                            \
+      jxbt_throw_host_failure(env, (detail));                                                                          \
+    } else if ((res) == MSG_TRANSFER_FAILURE) {                                                                        \
+      jxbt_throw_transfer_failure(env, (detail));                                                                      \
+    } else if ((res) == MSG_TIMEOUT) {                                                                                 \
+      jxbt_throw_time_out_failure(env, (detail));                                                                      \
+    } else if ((res) == MSG_TASK_CANCELED) {                                                                           \
+      jxbt_throw_task_cancelled(env, (detail));                                                                        \
     }                                                                                                                  \
   } while (0)
 
 /* Throws an exception according to its name */
-void jxbt_throw_by_name(JNIEnv* env, const char* name, std::string msg);
+void jxbt_throw_by_name(JNIEnv* env, const char* name, const std::string& msg);
 /** Thrown on internal error of this layer, or on problem with JNI */
-void jxbt_throw_jni(JNIEnv* env, std::string msg);
+void jxbt_throw_jni(JNIEnv* env, const std::string& msg);
 /** Thrown when using an object not bound to a native one where it should, or reverse (kinda JNI issue) */
-void jxbt_throw_notbound(JNIEnv* env, std::string kind, void* pointer);
+void jxbt_throw_notbound(JNIEnv* env, const std::string& kind, void* pointer);
 /** Thrown if NULL gets used */
-void jxbt_throw_null(JNIEnv* env, std::string msg);
+void jxbt_throw_null(JNIEnv* env, const std::string& msg);
 
 /** Thrown on illegal arguments */
-void jxbt_throw_illegal(JNIEnv* env, std::string msg);
-/** Thrown when looking for an host from name does not lead to anything */
-void jxbt_throw_host_not_found(JNIEnv* env, std::string invalid_name);
-/** Thrown when looking for an host from name does not lead to anything */
-void jxbt_throw_process_not_found(JNIEnv* env, std::string invalid_name);
-/** Thrown when a transfer failure accure while Sending task */
-void jxbt_throw_transfer_failure(JNIEnv* env, std::string detail);
+void jxbt_throw_illegal(JNIEnv* env, const std::string& msg);
+/** Thrown when looking for a host from name does not lead to anything */
+void jxbt_throw_host_not_found(JNIEnv* env, const std::string& invalid_name);
+/** Thrown when looking for a host from name does not lead to anything */
+void jxbt_throw_process_not_found(JNIEnv* env, const std::string& invalid_name);
+/** Thrown when a transfer failure occurs while Sending task */
+void jxbt_throw_transfer_failure(JNIEnv* env, const std::string& detail);
 /** Thrown when a host failure occurs while Sending a task*/
-void jxbt_throw_host_failure(JNIEnv* env, std::string details);
+void jxbt_throw_host_failure(JNIEnv* env, const std::string& details);
 /** Thrown when a timeout occurs while Sending a task */
-void jxbt_throw_time_out_failure(JNIEnv* env, std::string details);
+void jxbt_throw_time_out_failure(JNIEnv* env, const std::string& details);
 /**Thrown when a task is canceled */
-void jxbt_throw_task_cancelled(JNIEnv* env, std::string details);
+void jxbt_throw_task_cancelled(JNIEnv* env, const std::string& details);
 /** Thrown when looking for a storage from name does not lead to anything */
-void jxbt_throw_storage_not_found(JNIEnv* env, std::string invalid_name);
-}
+void jxbt_throw_storage_not_found(JNIEnv* env, const std::string& invalid_name);
+
 #endif