diff options
| author | Ben Cheng <bccheng@google.com> | 2014-05-20 17:53:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-20 17:53:18 +0000 |
| commit | 3816305b58b0eeb098f2f989ef03208d1f29f4da (patch) | |
| tree | 36d99dab90bacb8de46c4aa3cf5ca9a39c695600 | |
| parent | 51e27f955b79846e36097532a725f4b7a3eefef8 (diff) | |
| parent | 43232920f398d3673dfc3cd2bd414c361ccb4237 (diff) | |
| download | system_core-3816305b58b0eeb098f2f989ef03208d1f29f4da.zip system_core-3816305b58b0eeb098f2f989ef03208d1f29f4da.tar.gz system_core-3816305b58b0eeb098f2f989ef03208d1f29f4da.tar.bz2 | |
Merge "Address additional warnings found by GCC 4.9."
| -rw-r--r-- | liblog/tests/liblog_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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) { |