SF.net SVN: openvrml:[3520] trunk

[<br...@us...>]

Revision: 3520
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3520&view=rev
Author:   braden
Date:     2008-08-21 07:56:31 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Quell gcc warning about deprecated automatic conversion of string literals to char* (from const char*).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/script/java.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-08-21 07:49:40 UTC (rev 3519)
+++ trunk/ChangeLog	2008-08-21 07:56:31 UTC (rev 3520)
@@ -1,5 +1,11 @@
 2008-08-21 Braden McDaniel  <br...@en...>
 
+	* src/script/java.cpp (create_java_vm(JavaVM *&, JNIEnv *&)):
+	Quell gcc warning about deprecated automatic conversion of string
+	literals to char* (from const char*).
+
+2008-08-21 Braden McDaniel  <br...@en...>
+
 	* src/libopenvrml-gl/openvrml/gl/viewer.cpp
 	(openvrml::gl::viewer::do_insert_shell(unsigned int, const
 	std::vector<vec3f> & coord, const std::vector<int32> &
@@ -7,7 +13,8 @@
 	std::vector<int32> & color_index, const std::vector<vec3f> &
 	normal, const std::vector<int32> & normal_index, const
 	std::vector<vec2f> & tex_coord, const std::vector<int32> &
-	tex_coord_index)): Quell some warnings from gcc.
+	tex_coord_index)): Quell some warnings from gcc about comparing
+	signed and unsigned types.
 
 2008-08-15 Braden McDaniel  <br...@en...>
 

Modified: trunk/src/script/java.cpp
===================================================================
--- trunk/src/script/java.cpp	2008-08-21 07:49:40 UTC (rev 3519)
+++ trunk/src/script/java.cpp	2008-08-21 07:56:31 UTC (rev 3520)
@@ -107,9 +107,9 @@
 namespace {
 
     OPENVRML_JAVA_LOCAL lt_dlhandle libjvm_handle;
-    jint (OPENVRML_JAVA_LOCAL * CreateJavaVM)(JavaVM **, void **, void *);
+    OPENVRML_JAVA_LOCAL jint (*CreateJavaVM)(JavaVM **, void **, void *);
 
-    JavaVM * vm;
+    OPENVRML_JAVA_LOCAL JavaVM * vm;
 
     OPENVRML_JAVA_LOCAL class OPENVRML_JAVA_LOCAL load_libjvm {
     public:
@@ -319,7 +319,8 @@
         JavaVMOption options[2] = {};
         options[0].optionString =
             const_cast<char *>(classpath_option_str.c_str());
-        options[1].optionString = "-verbose:class,jni";
+        options[1].optionString =
+            const_cast<char *>("-verbose:class,jni");
 
         JavaVMInitArgs args;
         args.version = JNI_VERSION_1_2;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.