From: <br...@us...> - 2008-10-03 03:38:41
|
Revision: 3709 http://openvrml.svn.sourceforge.net/openvrml/?rev=3709&view=rev Author: braden Date: 2008-10-03 03:38:38 +0000 (Fri, 03 Oct 2008) Log Message: ----------- Use jlong in JNI function signatures to ensure consistency with javah output. Modified Paths: -------------- trunk/ChangeLog trunk/src/script/java.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-10-02 07:05:06 UTC (rev 3708) +++ trunk/ChangeLog 2008-10-03 03:38:38 UTC (rev 3709) @@ -1,5 +1,16 @@ 2008-10-02 Braden McDaniel <br...@en...> + Use jlong in JNI function signatures to ensure consistency with + javah output. + + * src/script/java.cpp + (Java_vrml_field_SFString_createPeer(JNIEnv *, jclass, jstring)): + Use jlong for the return type. + (Java_vrml_field_SFTime_createPeer(JNIEnv *, jclass, jdouble)): + Use jlong for the return type. + +2008-10-02 Braden McDaniel <br...@en...> + Keep track of host instances in openvrml-xembed and shut down when the last one terminates. Modified: trunk/src/script/java.cpp =================================================================== --- trunk/src/script/java.cpp 2008-10-02 07:05:06 UTC (rev 3708) +++ trunk/src/script/java.cpp 2008-10-03 03:38:38 UTC (rev 3709) @@ -3236,9 +3236,9 @@ return 0; } -long JNICALL Java_vrml_field_SFString_createPeer(JNIEnv * const env, - jclass, - const jstring jstr) +jlong JNICALL Java_vrml_field_SFString_createPeer(JNIEnv * const env, + jclass, + const jstring jstr) { std::auto_ptr<openvrml::field_value> peer; try { @@ -3317,9 +3317,9 @@ return 0.0; } -long JNICALL Java_vrml_field_SFTime_createPeer(JNIEnv * const env, - jclass, - const jdouble time) +jlong JNICALL Java_vrml_field_SFTime_createPeer(JNIEnv * const env, + jclass, + const jdouble time) { std::auto_ptr<openvrml::sftime> peer;; try { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |