summaryrefslogtreecommitdiffstats
path: root/libutils
diff options
context:
space:
mode:
authorSasha Levitskiy <sanek@google.com>2014-04-12 00:00:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-12 00:00:02 +0000
commit43cb7ae6c31ced8cd518eab59dfea31ab1ade812 (patch)
tree22f8c327a48e787108fbd09969ef515750fb6013 /libutils
parent7acecec433b396405279c3fa35359636dbcc7d47 (diff)
parent4f362e438c6ee5688c4f2f444203ed7acffa566b (diff)
downloadcore-43cb7ae6c31ced8cd518eab59dfea31ab1ade812.tar.gz
core-43cb7ae6c31ced8cd518eab59dfea31ab1ade812.tar.bz2
core-43cb7ae6c31ced8cd518eab59dfea31ab1ade812.zip
am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."
* commit '4f362e438c6ee5688c4f2f444203ed7acffa566b': Cleanup: warning fixit.
Diffstat (limited to 'libutils')
-rw-r--r--libutils/tests/BasicHashtable_test.cpp2
-rw-r--r--libutils/tests/LruCache_test.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libutils/tests/BasicHashtable_test.cpp b/libutils/tests/BasicHashtable_test.cpp
index 7dcf7509d..a61b1e10a 100644
--- a/libutils/tests/BasicHashtable_test.cpp
+++ b/libutils/tests/BasicHashtable_test.cpp
@@ -397,7 +397,7 @@ TEST_F(BasicHashtableTest, Next_WhenNonEmpty_IteratesOverAllEntries) {
const SimpleEntry& entry = h.entryAt(index);
ASSERT_GE(entry.key, 0);
ASSERT_LT(entry.key, N);
- ASSERT_EQ(false, set[entry.key]);
+ ASSERT_FALSE(set[entry.key]);
ASSERT_EQ(entry.key * 10, entry.value);
set[entry.key] = true;
diff --git a/libutils/tests/LruCache_test.cpp b/libutils/tests/LruCache_test.cpp
index e573952c0..bcbea323f 100644
--- a/libutils/tests/LruCache_test.cpp
+++ b/libutils/tests/LruCache_test.cpp
@@ -184,7 +184,7 @@ TEST_F(LruCacheTest, StressTest) {
for (size_t i = 0; i < kNumKeys; i++) {
strings[i] = (char *)malloc(16);
- sprintf(strings[i], "%d", i);
+ sprintf(strings[i], "%zu", i);
}
srandom(12345);