A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
guess what? I hate our java crufty code
[simgrid.git]
/
src
/
bindings
/
java
/
jxbt_utilities.h
diff --git
a/src/bindings/java/jxbt_utilities.h
b/src/bindings/java/jxbt_utilities.h
index
2218349
..
067a654
100644
(file)
--- a/
src/bindings/java/jxbt_utilities.h
+++ b/
src/bindings/java/jxbt_utilities.h
@@
-1,7
+1,6
@@
/* Various JNI helper functions */
/* Various JNI helper functions */
-/* Copyright (c) 2007-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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. */
/* 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. */
@@
-11,6
+10,7
@@
#include <jni.h>
#include <stdint.h>
#include <jni.h>
#include <stdint.h>
+#include <string>
SG_BEGIN_DECL()
SG_BEGIN_DECL()
@@
-49,33
+49,30
@@
jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, const char *name,
} } while (0)
/* Throws an exception according to its name */
} } while (0)
/* Throws an exception according to its name */
-void jxbt_throw_by_name(JNIEnv
* env, const char *name, char *
msg);
+void jxbt_throw_by_name(JNIEnv
* env, const char* name, std::string
msg);
/** Thrown on internal error of this layer, or on problem with JNI */
/** Thrown on internal error of this layer, or on problem with JNI */
-void jxbt_throw_jni(JNIEnv
* env, const char *
msg);
+void jxbt_throw_jni(JNIEnv
* env, std::string
msg);
/** Thrown when using an object not bound to a native one where it should, or reverse (kinda JNI issue) */
/** 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, const char *kind, void *pointer);
-/** Thrown on error in native MSG code */
-void jxbt_throw_native(JNIEnv * env, char *msg);
+void jxbt_throw_notbound(JNIEnv* env, std::string kind, void* pointer);
/** Thrown if NULL gets used */
/** Thrown if NULL gets used */
-void jxbt_throw_null(JNIEnv
* env, char *
msg);
+void jxbt_throw_null(JNIEnv
* env, std::string
msg);
/** Thrown on illegal arguments */
/** Thrown on illegal arguments */
-void jxbt_throw_illegal(JNIEnv
* env, char *
msg);
+void jxbt_throw_illegal(JNIEnv
* env, std::string
msg);
/** Thrown when looking for an host from name does not lead to anything */
/** Thrown when looking for an host from name does not lead to anything */
-void jxbt_throw_host_not_found(JNIEnv
* env, const char *
invalid_name);
+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 */
/** Thrown when looking for an host from name does not lead to anything */
-void jxbt_throw_process_not_found(JNIEnv
* env, const char *
invalid_name);
+void jxbt_throw_process_not_found(JNIEnv
* env, std::string
invalid_name);
/** Thrown when a transfer failure accure while Sending task */
/** Thrown when a transfer failure accure while Sending task */
-void jxbt_throw_transfer_failure(JNIEnv
* env, char *
detail);
+void jxbt_throw_transfer_failure(JNIEnv
* env, std::string
detail);
/** Thrown when a host failure occurs while Sending a task*/
/** Thrown when a host failure occurs while Sending a task*/
-void jxbt_throw_host_failure(JNIEnv
* env, char *
details);
+void jxbt_throw_host_failure(JNIEnv
* env, std::string
details);
/** Thrown when a timeout occurs while Sending a task */
/** Thrown when a timeout occurs while Sending a task */
-void jxbt_throw_time_out_failure(JNIEnv
* env, char *
details);
+void jxbt_throw_time_out_failure(JNIEnv
* env, std::string
details);
/**Thrown when a task is canceled */
/**Thrown when a task is canceled */
-void jxbt_throw_task_cancelled(JNIEnv
* env, char *
details);
+void jxbt_throw_task_cancelled(JNIEnv
* env, std::string
details);
/** Thrown when looking for a storage from name does not lead to anything */
/** Thrown when looking for a storage from name does not lead to anything */
-void jxbt_throw_storage_not_found(JNIEnv
* env, const char *
invalid_name);
+void jxbt_throw_storage_not_found(JNIEnv
* env, std::string
invalid_name);
SG_END_DECL()
SG_END_DECL()
-#endif /* ! JXBT_UTILITY_H */
-
+#endif