summaryrefslogtreecommitdiffstats
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
commit323bcb9eb9c549fe610954ef308c52f4c4ea7a67 (patch)
treec6a8267c07c39dd2770bec2320cb258c243ec97f
parentf54b15a86dfe00cd580b52ef3658b890591f7e15 (diff)
downloadbcm5719-llvm-323bcb9eb9c549fe610954ef308c52f4c4ea7a67.tar.gz
bcm5719-llvm-323bcb9eb9c549fe610954ef308c52f4c4ea7a67.zip
AlignedCharArrayUnion is erroring with non-clang compilers
llvm-svn: 170031
-rw-r--r--llvm/include/llvm/Support/YAMLTraits.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/include/llvm/Support/YAMLTraits.h b/llvm/include/llvm/Support/YAMLTraits.h
index 4376165e536..a0421a36571 100644
--- 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;
OpenPOWER on IntegriCloud