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

* commit '3816305b58b0eeb098f2f989ef03208d1f29f4da':
  Address additional warnings found by GCC 4.9.
This commit is contained in:
Ben Cheng 2014-05-20 18:09:57 +00:00 committed by Android Git Automerger
commit 7563a601e4

View file

@ -544,7 +544,7 @@ TEST(liblog, too_big_payload) {
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) {