From: Nick Kledzik <kledzik@apple.com>
Date: Wed, 12 Dec 2012 22:03:57 +0000 (+0000)
Subject: AlignedCharArrayUnion is erroring with non-clang compilers
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df2f74fa411e54bc1e5f16eb86e5cb1bde973746;p=oota-llvm.git

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 4376165e536..a0421a36571 100644
--- 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;