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
Merge master into mc-process
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg_process.h
diff --git
a/src/bindings/java/jmsg_process.h
b/src/bindings/java/jmsg_process.h
index
1d268cd
..
54b211d
100644
(file)
--- a/
src/bindings/java/jmsg_process.h
+++ b/
src/bindings/java/jmsg_process.h
@@
-1,10
+1,10
@@
/* Functions related to the java process instances. */
/* Functions related to the java process instances. */
-/* Copyright (c) 2007-201
2
. The SimGrid Team.
+/* Copyright (c) 2007-201
4
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef MSG_JPROCESS_H
#define MSG_JPROCESS_H
#ifndef MSG_JPROCESS_H
#define MSG_JPROCESS_H
@@
-174,7
+174,7
@@
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID
(JNIEnv *, jclass, jint);
/*
* Class org_simgrid_msg_Process
(JNIEnv *, jclass, jint);
/*
* Class org_simgrid_msg_Process
- * Method
waitFor
+ * Method
getProperty
* Signature (D)V
*/
JNIEXPORT jobject JNICALL
* Signature (D)V
*/
JNIEXPORT jobject JNICALL