Fix gcc-4.6 warnings.

Change-Id: I62cfb8b1a39499366ee18c1904e6991567f78571

diff --git a/vm/IndirectRefTable.cpp b/vm/IndirectRefTable.cpp
index 270727c..b8ae767 100644 (file)
--- a/vm/IndirectRefTable.cpp
+++ b/vm/IndirectRefTable.cpp
@@ -105,7 +105,7 @@ IndirectRef IndirectRefTable::add(u4 cookie, Object* obj)
             LOGE("Unable to expand %s reference table from %d to %d (max=%d)",
                     indirectRefKindToString(kind), allocEntries,
                     newSize, maxEntries);
-            return false;
+            return NULL;
         }
         LOGV("Growing %s reference table %p from %d to %d (max=%d)",
                 indirectRefKindToString(kind), this,

diff --git a/vm/jdwp/JdwpConstants.cpp b/vm/jdwp/JdwpConstants.cpp
index ab9d872..e98ff43 100644 (file)
--- a/vm/jdwp/JdwpConstants.cpp
+++ b/vm/jdwp/JdwpConstants.cpp
@@ -238,9 +238,9 @@ const char* dvmJdwpSuspendPolicyStr(JdwpSuspendPolicy policy)
 const char* dvmJdwpSuspendStatusStr(JdwpSuspendStatus status)
 {
     switch (status) {
-    case 0:                         return "Not SUSPENDED";
-    case SUSPEND_STATUS_SUSPENDED:  return "SUSPENDED";
-    default:                        return "?UNKNOWN?";
+    case SUSPEND_STATUS_NOT_SUSPENDED: return "Not SUSPENDED";
+    case SUSPEND_STATUS_SUSPENDED:     return "SUSPENDED";
+    default:                           return "?UNKNOWN?";
     }
 }
 

diff --git a/vm/jdwp/JdwpConstants.h b/vm/jdwp/JdwpConstants.h
index 28e6d45..9913759 100644 (file)
--- a/vm/jdwp/JdwpConstants.h
+++ b/vm/jdwp/JdwpConstants.h
@@ -179,7 +179,8 @@ const char* dvmJdwpSuspendPolicyStr(JdwpSuspendPolicy policy);
  * SuspendStatus constants.
  */
 enum JdwpSuspendStatus {
-    SUSPEND_STATUS_SUSPENDED = 1,
+    SUSPEND_STATUS_NOT_SUSPENDED = 0,
+    SUSPEND_STATUS_SUSPENDED     = 1,
 };
 const char* dvmJdwpSuspendStatusStr(JdwpSuspendStatus status);