summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Cheng <bccheng@google.com>2014-04-11 23:37:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-11 23:37:49 +0000
commitc5543320b024596c86fcb7b05b0b0f9ff609a9d1 (patch)
tree7d04fcc7aea8227e96544683b0bb162abe8383a1
parent89fe3ac1a8768fc4b71c5dc401baa70b80d070d7 (diff)
parent7acecec433b396405279c3fa35359636dbcc7d47 (diff)
downloadsystem_core-c5543320b024596c86fcb7b05b0b0f9ff609a9d1.zip
system_core-c5543320b024596c86fcb7b05b0b0f9ff609a9d1.tar.gz
system_core-c5543320b024596c86fcb7b05b0b0f9ff609a9d1.tar.bz2
am 7acecec4: am 3c29e66e: am 2f365509: Merge "Fix signed vs unsigned comparison."
* commit '7acecec433b396405279c3fa35359636dbcc7d47': Fix signed vs unsigned comparison.
-rw-r--r--liblog/tests/liblog_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp
index d726f2d..24ae738 100644
--- a/liblog/tests/liblog_test.cpp
+++ b/liblog/tests/liblog_test.cpp
@@ -484,7 +484,7 @@ TEST(liblog, max_payload) {
EXPECT_EQ(true, matches);
- EXPECT_LE(sizeof(max_payload_buf), max_len);
+ EXPECT_LE(sizeof(max_payload_buf), static_cast<size_t>(max_len));
android_logger_list_close(logger_list);
}