diff options
| author | Carl Shapiro <cshapiro@google.com> | 2010-12-07 11:43:38 -0800 |
|---|---|---|
| committer | Carl Shapiro <cshapiro@google.com> | 2010-12-07 11:43:38 -0800 |
| commit | fc75f3ed87b55d625b6054e18645da5cbdba31c6 (patch) | |
| tree | 5e4f2844634b8ddf532f03c1328f2c7601c48e3c /vm/test | |
| parent | 70624ec99772ce2c6222d066bb7f03a764c45128 (diff) | |
| download | android_dalvik-fc75f3ed87b55d625b6054e18645da5cbdba31c6.tar.gz android_dalvik-fc75f3ed87b55d625b6054e18645da5cbdba31c6.tar.bz2 android_dalvik-fc75f3ed87b55d625b6054e18645da5cbdba31c6.zip | |
Fix implicit conversions, rename reserved works, enable -Wc++-compat.
Change-Id: I06292964a6882ea2d0c17c5c962db95e46b01543
Diffstat (limited to 'vm/test')
| -rw-r--r-- | vm/test/TestHash.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vm/test/TestHash.c b/vm/test/TestHash.c index 26de14130..431e62ab0 100644 --- a/vm/test/TestHash.c +++ b/vm/test/TestHash.c @@ -142,10 +142,10 @@ bool dvmTestHash(void) /* two entries, same hash, different values */ char* str1; - str1 = dvmHashTableLookup(pTab, hash, strdup("one"), + str1 = (char*) dvmHashTableLookup(pTab, hash, strdup("one"), (HashCompareFunc) strcmp, true); assert(str1 != NULL); - str = dvmHashTableLookup(pTab, hash, strdup("two"), + str = (const char*) dvmHashTableLookup(pTab, hash, strdup("two"), (HashCompareFunc) strcmp, true); /* remove the first one */ @@ -167,10 +167,12 @@ bool dvmTestHash(void) } /* see if we can find them */ - str = dvmHashTableLookup(pTab, hash, "one", (HashCompareFunc) strcmp,false); + str = (const char*) dvmHashTableLookup(pTab, hash, "one", + (HashCompareFunc) strcmp,false); if (str != NULL) LOGE("TestHash deleted entry has returned!"); - str = dvmHashTableLookup(pTab, hash, "two", (HashCompareFunc) strcmp,false); + str = (const char*) dvmHashTableLookup(pTab, hash, "two", + (HashCompareFunc) strcmp,false); if (str == NULL) LOGE("TestHash entry vanished\n"); |