commit 7563a601e47db0a7c429fff1776f8a17a6157ce0
author Ben Cheng <bccheng@google.com> Tue May 20 18:09:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 20 18:09:57 2014 +0000
tree 99a2c43ac75802d62cbecbe617a14ece05afc3a8
parent 796b20157f75e46ad91b7d894796e0ba55a7766e
parent 3816305b58b0eeb098f2f989ef03208d1f29f4da

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

* commit '3816305b58b0eeb098f2f989ef03208d1f29f4da':
  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) {