svn commit: r935670 - in /harmony/enhanced/java/trunk/drlvm/vm: jitrino/src/main/PMF.cpp vmcore/src/exception/exceptions.cpp vmcore/src/jvmti/jvmti_thread.cpp vmcore/src/jvmti/jvmti_thread_group.cpp

[hi...@apache.org]

Author: hindessm
Date: Mon Apr 19 17:06:17 2010
New Revision: 935670

URL: http://svn.apache.org/viewvc?rev=935670&view=rev
Log:
'false' is not a pointer type so use NULL instead.  Avoids compile errors
on gcc 4.5.

Modified:
    harmony/enhanced/java/trunk/drlvm/vm/jitrino/src/main/PMF.cpp
    harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/exception/exceptions.cpp
    harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp
    harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp

Modified: harmony/enhanced/java/trunk/drlvm/vm/jitrino/src/main/PMF.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/vm/jitrino/src/main/PMF.cpp?rev=935670&r1=935669&r2=935670&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/vm/jitrino/src/main/PMF.cpp (original)
+++ harmony/enhanced/java/trunk/drlvm/vm/jitrino/src/main/PMF.cpp Mon Apr 19 17:06:17 2010
@@ -1383,7 +1383,7 @@ void PMF::init (bool first_)
 {
     assert(!initialized);
     first = first_;
-    help_requested = false;
+    help_requested = NULL;
     processVMProperties();
     initialized = true;
 

Modified: harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/exception/exceptions.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/exception/exceptions.cpp?rev=935670&r1=935669&r2=935670&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/exception/exceptions.cpp (original)
+++ harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/exception/exceptions.cpp Mon Apr 19 17:06:17 2010
@@ -445,7 +445,7 @@ inline void exn_jni_print_stack_trace(FI
     tmn_suspend_disable();
     const char* exceptionNameChars = exc->object->vt()->clss->get_name()->bytes;
     tmn_suspend_enable();
-    const char *messageChars = GetStringUTFChars(jenv, message, false);
+    const char *messageChars = GetStringUTFChars(jenv, message, NULL);
     fprintf(f, "\n%s : %s\n", exceptionNameChars, messageChars);
 
     // gets stack trace to print it
@@ -497,10 +497,10 @@ inline void exn_jni_print_stack_trace(FI
         if (ExceptionCheck(jenv))
             return;
         const char *classNameChars =
-            GetStringUTFChars(jenv, className, false);
+            GetStringUTFChars(jenv, className, NULL);
         fprintf(f, "%s.", classNameChars);
         const char *methodNameChars =
-            GetStringUTFChars(jenv, methodName, false);
+            GetStringUTFChars(jenv, methodName, NULL);
         fprintf(f, "%s", methodNameChars);
 
         // gets information about java file name
@@ -514,7 +514,7 @@ inline void exn_jni_print_stack_trace(FI
         if (fileName) {
             // gets line number and prints it after file name
             const char *fileNameChars =
-                GetStringUTFChars(jenv, fileName, false);
+                GetStringUTFChars(jenv, fileName, NULL);
             jint sourceLineNumber =
                 CallIntMethod(jenv, stackTraceElement, getLineNumberId);
             if (ExceptionCheck(jenv))

Modified: harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp?rev=935670&r1=935669&r2=935670&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp (original)
+++ harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread.cpp Mon Apr 19 17:06:17 2010
@@ -509,7 +509,7 @@ jvmtiGetThreadInfo(jvmtiEnv* env,
     jfieldID id = jvmti_test_jenv->GetFieldID(cl, "name", "Ljava/lang/String;");
     assert(id != NULL); // field must exist in kernel class
     jstring name = jvmti_test_jenv->GetObjectField(thread, id);
-    info_ptr->name = (char*)jvmti_test_jenv->GetStringUTFChars(name, false);
+    info_ptr->name = (char*)jvmti_test_jenv->GetStringUTFChars(name, NULL);
 
     id = jvmti_test_jenv->GetFieldID(cl, "priority", "I");
     assert(id != NULL); // field must exist in kernel class

Modified: harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp?rev=935670&r1=935669&r2=935670&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp (original)
+++ harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/jvmti/jvmti_thread_group.cpp Mon Apr 19 17:06:17 2010
@@ -132,7 +132,7 @@ jvmtiGetThreadGroupInfo(jvmtiEnv* env,
     id = jvmti_test_jenv->GetFieldID(cl, "name","Ljava/lang/String;");
     assert(id != NULL);
     jstring name = jvmti_test_jenv->GetObjectField(group, id);
-    info_ptr->name = (char*)jvmti_test_jenv->GetStringUTFChars(name, false);
+    info_ptr->name = (char*)jvmti_test_jenv->GetStringUTFChars(name, NULL);
 
     id = jvmti_test_jenv->GetFieldID(cl, "maxPriority","I");
     assert(id != NULL);