commit 78503c8063a0aa643e5c9f12b2771b977ce1e0b0
author Colin Cross <ccross@android.com> Fri May 01 01:34:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 01 01:34:56 2015 +0000
tree fc02deabf8b4132b1db6483e37e16de5feb33793
parent ad8c10dee1d6592fb6ef98d4ced8edef44f66262
parent 1e0b8d8471e684a1180a5ee5fd79a939f4f401d5

am 8c2b9269: am ab1aa20d: am bacac0f7: Merge "Fix comparison between signed and unsigned error on darwin"

* commit '8c2b9269c3d65947dd525bb1c51377ec725377f2':
  Fix comparison between signed and unsigned error on darwin

base/file_test.cpp

diff --git a/base/file_test.cpp b/base/file_test.cpp
index cbb2751..b138094 100644
--- a/base/file_test.cpp
+++ b/base/file_test.cpp
@@ -66,7 +66,7 @@
       << strerror(errno);
   struct stat sb;
   ASSERT_EQ(0, stat(tf.filename, &sb));
-  ASSERT_EQ(0660U, (sb.st_mode & ~S_IFMT));
+  ASSERT_EQ(0660U, static_cast<unsigned int>(sb.st_mode & ~S_IFMT));
   ASSERT_EQ(getuid(), sb.st_uid);
   ASSERT_EQ(getgid(), sb.st_gid);
   std::string s;