AlignedCharArrayUnion is erroring with non-clang compilers

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170031 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/YAMLTraits.h b/include/llvm/Support/YAMLTraits.h
index 4376165e536751bf5b0a140cc2eaea31ac680b2c..a0421a365718d785ca5a2805584e3149fd84b77e 100644 (file)
--- a/include/llvm/Support/YAMLTraits.h
+++ b/include/llvm/Support/YAMLTraits.h
@@ -630,9 +630,9 @@ struct MappingNormalization {
   TNorm* operator->() { return BufPtr; }
 
 private:
-  typedef typename llvm::AlignedCharArrayUnion<TNorm> Storage;
-
-  Storage       Buffer;
+  //typedef typename llvm::AlignedCharArrayUnion<TNorm> Storage;
+  //Storage       Buffer;
+  char          Buffer[sizeof(TNorm)];
   IO           &io;
   TNorm        *BufPtr;
   TFinal       &Result;
@@ -666,9 +666,9 @@ struct MappingNormalizationHeap {
   TNorm* operator->() { return BufPtr; }
 
 private:
-  typedef typename llvm::AlignedCharArrayUnion<TNorm> Storage;
-
-  Storage       Buffer;
+  //typedef typename llvm::AlignedCharArrayUnion<TNorm> Storage;
+  //Storage       Buffer;
+  char          Buffer[sizeof(TNorm)];
   IO           &io;
   TNorm        *BufPtr;
   TFinal       &Result;