commit f3162a283128531ff950c9498520852e0ac0b78d
author Dan Albert <danalbert@google.com> Fri Jan 15 23:58:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 15 23:58:08 2016 +0000
tree 6f73ad7c011b57303aca51e969e8a1bd50399625
parent adc1f53993be3f0458585fd0f43e81645efb5335
parent 51c3eeb11e264b1ae21016b0ef8edf0d54dcf190

Merge "Fix a couple sign-comparison warnings." am: 422359aad4
am: b2d312749e

* commit 'b2d312749efe6b46dc0faf67f72d3a4b40434934':
  Fix a couple sign-comparison warnings.

adb/sysdeps_win32_test.cpp

diff --git a/adb/sysdeps_win32_test.cpp b/adb/sysdeps_win32_test.cpp
index 81923cb..1d40281 100755
--- a/adb/sysdeps_win32_test.cpp
+++ b/adb/sysdeps_win32_test.cpp
@@ -66,7 +66,7 @@
     const char* path_val = adb_getenv("PATH");
     EXPECT_NE(nullptr, path_val);
     if (path_val != nullptr) {
-        EXPECT_GT(strlen(path_val), 0);
+        EXPECT_GT(strlen(path_val), 0U);
     }
 }
 

base/utf8_test.cpp

diff --git a/base/utf8_test.cpp b/base/utf8_test.cpp
index dde7490..ae8fc8c 100755
--- a/base/utf8_test.cpp
+++ b/base/utf8_test.cpp
@@ -44,7 +44,7 @@
   // specific replacement character that UTF8ToWide() may replace the invalid
   // UTF-8 characters with because we want to allow that to change if the
   // implementation changes.
-  EXPECT_EQ(0, wide.find(L"before"));
+  EXPECT_EQ(0U, wide.find(L"before"));
   const wchar_t after_wide[] = L"after";
   EXPECT_EQ(wide.length() - (arraysize(after_wide) - 1), wide.find(after_wide));
 }