summaryrefslogtreecommitdiffstats
path: root/libutils
diff options
context:
space:
mode:
authorSasha Levitskiy <sanek@google.com>2014-04-12 00:02:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-12 00:02:33 +0000
commite2acb82a9449d0bbf993cda270f3519862ec571a (patch)
tree363fff0183ffc1c252f381da52dab5e4ab57c3fd /libutils
parentc5543320b024596c86fcb7b05b0b0f9ff609a9d1 (diff)
parent43cb7ae6c31ced8cd518eab59dfea31ab1ade812 (diff)
downloadsystem_core-e2acb82a9449d0bbf993cda270f3519862ec571a.zip
system_core-e2acb82a9449d0bbf993cda270f3519862ec571a.tar.gz
system_core-e2acb82a9449d0bbf993cda270f3519862ec571a.tar.bz2
am 43cb7ae6: am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."
* commit '43cb7ae6c31ced8cd518eab59dfea31ab1ade812': 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 7dcf750..a61b1e1 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 e573952..bcbea32 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);