[llvm-branch-commits] [llvm-branch] r133422 - /llvm/branches/type-system-rewrite/include/llvm/ADT/StringMap.h

[Chris Lattner]

Author: lattner
Date: Mon Jun 20 01:52:27 2011
New Revision: 133422

URL: http://llvm.org/viewvc/llvm-project?rev=133422&view=rev
Log:
random cleanup.

Modified:
    llvm/branches/type-system-rewrite/include/llvm/ADT/StringMap.h

Modified: llvm/branches/type-system-rewrite/include/llvm/ADT/StringMap.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/type-system-rewrite/include/llvm/ADT/StringMap.h?rev=133422&r1=133421&r2=133422&view=diff
==============================================================================
--- llvm/branches/type-system-rewrite/include/llvm/ADT/StringMap.h (original)
+++ llvm/branches/type-system-rewrite/include/llvm/ADT/StringMap.h Mon Jun 20 01:52:27 2011
@@ -355,8 +355,7 @@
   /// exists, return it.  Otherwise, default construct a value, insert it, and
   /// return.
   template <typename InitTy>
-  StringMapEntry<ValueTy> &GetOrCreateValue(StringRef Key,
-                                            InitTy Val) {
+  MapEntryTy &GetOrCreateValue(StringRef Key, InitTy Val) {
     unsigned BucketNo = LookupBucketFor(Key);
     ItemBucket &Bucket = TheTable[BucketNo];
     if (Bucket.Item && Bucket.Item != getTombstoneVal())
@@ -378,19 +377,19 @@
     return *NewItem;
   }
 
-  StringMapEntry<ValueTy> &GetOrCreateValue(StringRef Key) {
+  MapEntryTy &GetOrCreateValue(StringRef Key) {
     return GetOrCreateValue(Key, ValueTy());
   }
 
+  // FIXME: Remove this method.
   template <typename InitTy>
-  StringMapEntry<ValueTy> &GetOrCreateValue(const char *KeyStart,
-                                            const char *KeyEnd,
-                                            InitTy Val) {
+  MapEntryTy &GetOrCreateValue(const char *KeyStart, const char *KeyEnd,
+                               InitTy Val) {
     return GetOrCreateValue(StringRef(KeyStart, KeyEnd - KeyStart), Val);
   }
 
-  StringMapEntry<ValueTy> &GetOrCreateValue(const char *KeyStart,
-                                            const char *KeyEnd) {
+  // FIXME: Remove this method.
+  MapEntryTy &GetOrCreateValue(const char *KeyStart, const char *KeyEnd) {
     return GetOrCreateValue(StringRef(KeyStart, KeyEnd - KeyStart));
   }