commit aceba829f127349b331601fcc65293f5e81f7a65
author Ben Cheng <bccheng@google.com> Tue May 20 18:22:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 20 18:22:55 2014 +0000
tree c0fd9fb927bc45cd22a4315be0d1b2645add5cb3
parent fa59e0a48786505d5d8e65e0714f65b85d260dfc
parent cbe7544a3e848872def9cbf67110c78aa21d8ab1

am cbe7544a: am 7563a601: am 3816305b: Merge "Address additional warnings found by GCC 4.9."

* commit 'cbe7544a3e848872def9cbf67110c78aa21d8ab1':
  Address additional warnings found by GCC 4.9.

liblog/tests/liblog_test.cpp

diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp
index ec35e45..393e2cd 100644
--- a/liblog/tests/liblog_test.cpp
+++ b/liblog/tests/liblog_test.cpp
@@ -544,7 +544,7 @@
     EXPECT_LE(LOGGER_ENTRY_MAX_PAYLOAD - sizeof(big_payload_tag),
               static_cast<size_t>(max_len));
 
-    EXPECT_EQ(ret, max_len + sizeof(big_payload_tag));
+    EXPECT_EQ(ret, max_len + static_cast<ssize_t>(sizeof(big_payload_tag)));
 }
 
 TEST(liblog, dual_reader) {