aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kledzik <kledzik@apple.com>2012-12-12 22:03:57 +0000
committerNick Kledzik <kledzik@apple.com>2012-12-12 22:03:57 +0000
commitdf2f74fa411e54bc1e5f16eb86e5cb1bde973746 (patch)
tree5b40df4afb2a14153ff325be8ee51d7208e7761f
parent1ebae9ab97c0e1e293c7c1014d10fb8a166fa649 (diff)
AlignedCharArrayUnion is erroring with non-clang compilers
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170031 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Support/YAMLTraits.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/llvm/Support/YAMLTraits.h b/include/llvm/Support/YAMLTraits.h
index 4376165e53..a0421a3657 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;