diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2012-08-17 01:47:25 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2012-08-17 01:47:25 +0000 |
commit | cbeb8d9869aafec3c2c1ee0922f0a4d5bb4a916a (patch) | |
tree | 30864ed862f39925ca23fde7e3becb3686a7a3a2 /include/llvm/ADT/DenseMap.h | |
parent | 083b48af14c8bfa0e96f63ebc889704d09655fd4 (diff) | |
download | llvm-cbeb8d9869aafec3c2c1ee0922f0a4d5bb4a916a.tar.gz llvm-cbeb8d9869aafec3c2c1ee0922f0a4d5bb4a916a.tar.bz2 llvm-cbeb8d9869aafec3c2c1ee0922f0a4d5bb4a916a.tar.xz |
Flatten the aligned-char-array utility template to be a directly
templated union at the request of Richard Smith. This makes it
substantially easier to type. =]
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162072 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/ADT/DenseMap.h')
-rw-r--r-- | include/llvm/ADT/DenseMap.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/llvm/ADT/DenseMap.h b/include/llvm/ADT/DenseMap.h index 65a70fbfa6..f60d688c0d 100644 --- a/include/llvm/ADT/DenseMap.h +++ b/include/llvm/ADT/DenseMap.h @@ -687,8 +687,7 @@ class SmallDenseMap /// A "union" of an inline bucket array and the struct representing /// a large bucket. This union will be discriminated by the 'Small' bit. - typename AlignedCharArray<BucketT[InlineBuckets], LargeRep>::union_type - storage; + AlignedCharArrayUnion<BucketT[InlineBuckets], LargeRep> storage; public: explicit SmallDenseMap(unsigned NumInitBuckets = 0) { @@ -834,8 +833,7 @@ public: return; // Nothing to do. // First move the inline buckets into a temporary storage. - typename AlignedCharArray<BucketT[InlineBuckets]>::union_type - TmpStorage; + AlignedCharArrayUnion<BucketT[InlineBuckets]> TmpStorage; BucketT *TmpBegin = reinterpret_cast<BucketT *>(TmpStorage.buffer); BucketT *TmpEnd = TmpBegin; |