From 39ff10a293012fe6f2db682c5518e1be2c50ca67 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 21 Jun 2011 06:22:33 +0000 Subject: [PATCH] use the MapEntryTy typedef instead of writing it out long form, add some fixme's about methods that should be removed. Merged from type-system-rewrite. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133504 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/StringMap.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h index 934cacc78a8..8aac2012b2e 100644 --- a/include/llvm/ADT/StringMap.h +++ b/include/llvm/ADT/StringMap.h @@ -307,7 +307,7 @@ public: return ValueTy(); } - ValueTy& operator[](StringRef Key) { + ValueTy &operator[](StringRef Key) { return GetOrCreateValue(Key).getValue(); } @@ -355,8 +355,7 @@ public: /// exists, return it. Otherwise, default construct a value, insert it, and /// return. template - StringMapEntry &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 @@ public: return *NewItem; } - StringMapEntry &GetOrCreateValue(StringRef Key) { + MapEntryTy &GetOrCreateValue(StringRef Key) { return GetOrCreateValue(Key, ValueTy()); } + // FIXME: Remove this method. template - StringMapEntry &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 &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)); } -- 2.34.1