|
From: <br...@us...> - 2009-03-19 04:07:25
|
Revision: 3845
http://openvrml.svn.sourceforge.net/openvrml/?rev=3845&view=rev
Author: braden
Date: 2009-03-19 04:07:16 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
Newer jni.h is more const-correct; play along.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/script/java.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-19 01:31:51 UTC (rev 3844)
+++ trunk/ChangeLog 2009-03-19 04:07:16 UTC (rev 3845)
@@ -1,5 +1,15 @@
2009-03-18 Braden McDaniel <br...@en...>
+ Newer jni.h is more const-correct; play along.
+
+ * src/script/java.cpp
+ (set_array_region_t<jfloat>::value): Added "const" for consistency
+ with newer jni.h.
+ (set_array_region_t<jdouble>::value): Added "const" for consistency
+ with newer jni.h.
+
+2009-03-18 Braden McDaniel <br...@en...>
+
* src/libopenvrml/openvrml/local/parse_vrml.h: Fixes to build with
gcc 4.0 (on Mac OS X 10.5). This compiler appears to have some
bugs with access rules and inner classes; interjecting some
Modified: trunk/src/script/java.cpp
===================================================================
--- trunk/src/script/java.cpp 2009-03-19 01:31:51 UTC (rev 3844)
+++ trunk/src/script/java.cpp 2009-03-19 04:07:16 UTC (rev 3845)
@@ -4491,20 +4491,20 @@
template <> struct set_array_region_t<jfloat> {
static void (JNIEnv::* const value)(
- array_type<jfloat>::type, jsize, jsize, jfloat *);
+ array_type<jfloat>::type, jsize, jsize, const jfloat *);
};
void (JNIEnv::* const set_array_region_t<jfloat>::value)(
- array_type<jfloat>::type, jsize, jsize, jfloat *) =
+ array_type<jfloat>::type, jsize, jsize, const jfloat *) =
&JNIEnv::SetFloatArrayRegion;
template <> struct set_array_region_t<jdouble> {
static void (JNIEnv::* const value)(
- array_type<jdouble>::type, jsize, jsize, jdouble *);
+ array_type<jdouble>::type, jsize, jsize, const jdouble *);
};
void (JNIEnv::* const set_array_region_t<jdouble>::value)(
- array_type<jdouble>::type, jsize, jsize, jdouble *) =
+ array_type<jdouble>::type, jsize, jsize, const jdouble *) =
&JNIEnv::SetDoubleArrayRegion;
template <typename T>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|