diff options
author | Chris Lattner <sabre@nondot.org> | 2010-09-04 18:45:02 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-09-04 18:45:02 +0000 |
commit | 061d21eaf8fcdb19b85db0755c208acbba7c8ef4 (patch) | |
tree | 8938df1222d7f19c3107b7ea114a788e1690f14f /include | |
parent | ab2cee6d51c11553d723b377c7c4df23f918fad2 (diff) | |
download | llvm-061d21eaf8fcdb19b85db0755c208acbba7c8ef4.tar.gz llvm-061d21eaf8fcdb19b85db0755c208acbba7c8ef4.tar.bz2 llvm-061d21eaf8fcdb19b85db0755c208acbba7c8ef4.tar.xz |
fix this to work with allocators that have reference type with compilers
that diagnose invalid references to references.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@113078 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r-- | include/llvm/ADT/StringMap.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h index 59ff6aa4f6..1b20f4fdd9 100644 --- a/include/llvm/ADT/StringMap.h +++ b/include/llvm/ADT/StringMap.h @@ -242,6 +242,9 @@ public: }; +template <typename T> struct ReferenceAdder { typedef T& result; }; +template <typename T> struct ReferenceAdder<T&> { typedef T result; }; + /// StringMap - This is an unconventional map that is specialized for handling /// keys that are "strings", which are basically ranges of bytes. This does some /// funky memory allocation and hashing things to make it extremely efficient, @@ -269,9 +272,10 @@ public: clear(); } - - AllocatorTy &getAllocator() { return Allocator; } - const AllocatorTy &getAllocator() const { return Allocator; } + typedef typename ReferenceAdder<AllocatorTy>::result AllocatorRefTy; + typedef typename ReferenceAdder<const AllocatorTy>::result AllocatorCRefTy; + AllocatorRefTy getAllocator() { return Allocator; } + AllocatorCRefTy getAllocator() const { return Allocator; } typedef const char* key_type; typedef ValueTy mapped_type; |