AlignedCharArrayUnion is erroring with non-clang compilers

llvm-svn: 170031

diff --git a/llvm/include/llvm/Support/YAMLTraits.h b/llvm/include/llvm/Support/YAMLTraits.h
index 4376165..a0421a3 100644 (file)
--- a/llvm/include/llvm/Support/YAMLTraits.h
+++ b/llvm/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;