RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

* Don't explicitly cast "0" to "void*". This doesn't work well with specialized

Browse Source 
StringMapEntryInitializer classes. Leave it for the compiler to figure out what
 the type is and what "0" should be transformed into.

* Un-disable the unit tests which test the StringMapEntryInitializer class.

llvm-svn: 61922
This commit is contained in:
Bill Wendling 2009-01-08 08:26:46 +00:00
parent 759c4201e9
commit 71f808dfa2
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/ADT/StringMap.h
View File

@ -182,7 +182,7 @@ public:
template<typename AllocatorTy>
static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd,
AllocatorTy &Allocator) {
return Create(KeyStart, KeyEnd, Allocator, (void*)0);
return Create(KeyStart, KeyEnd, Allocator, 0);
}
@ -195,7 +195,7 @@ public:
}
static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd) {
return Create(KeyStart, KeyEnd, (void*)0);
return Create(KeyStart, KeyEnd, 0);
}
/// GetStringMapEntryFromValue - Given a value that is known to be embedded
@ -378,7 +378,7 @@ public:
StringMapEntry<ValueTy> &GetOrCreateValue(const char *KeyStart,
const char *KeyEnd) {
return GetOrCreateValue(KeyStart, KeyEnd, (void*)0);
return GetOrCreateValue(KeyStart, KeyEnd, 0);
}
/// remove - Remove the specified key/value pair from the map, but do not

20
unittests/ADT/StringMapTest.cpp
View File

@ -11,6 +11,19 @@
#include "llvm/ADT/StringMap.h"
using namespace llvm;
namespace llvm {
template <>
class StringMapEntryInitializer<uint32_t> {
public:
template <typename InitTy>
static void Initialize(StringMapEntry<uint32_t> &T, InitTy InitVal) {
T.second = InitVal;
}
};
}
namespace {
// Test fixture
@ -140,10 +153,11 @@ TEST_F(StringMapTest, InsertAndEraseTest) {
// Test StringMapEntry::Create() method.
// DISABLED because this fails without a StringMapEntryInitializer, and
// I can't get it to compile with one.
TEST_F(StringMapTest, DISABLED_StringMapEntryTest) {
TEST_F(StringMapTest, StringMapEntryTest) {
MallocAllocator A;
StringMap<uint32_t>::value_type* entry =
StringMap<uint32_t>::value_type::Create(
testKeyFirst, testKeyLast, 1u);
testKeyFirst, testKeyLast, A, 1u);
EXPECT_STREQ(testKey, entry->first());
EXPECT_EQ(1u, entry->second);
}
@ -151,7 +165,7 @@ TEST_F(StringMapTest, DISABLED_StringMapEntryTest) {
// Test insert() method
// DISABLED because this fails without a StringMapEntryInitializer, and
// I can't get it to compile with one.
TEST_F(StringMapTest, DISABLED_InsertTest) {
TEST_F(StringMapTest, InsertTest) {
SCOPED_TRACE("InsertTest");
testMap.insert(
StringMap<uint32_t>::value_type::Create(