summaryrefslogtreecommitdiffstats
path: root/llvm/tools
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-07-12 20:28:02 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-07-12 20:28:02 +0000
commit023e65611deff2b536fe6a0801b5dbcd11907e8d (patch)
tree0a5541d33c35b5250681b2c8520f54eb6251485d /llvm/tools
parent3e2b21cd4d49d3b641cecef413a706595dba9ce5 (diff)
downloadbcm5719-llvm-023e65611deff2b536fe6a0801b5dbcd11907e8d.tar.gz
bcm5719-llvm-023e65611deff2b536fe6a0801b5dbcd11907e8d.zip
Fix the build with c++03.
llvm-svn: 186198
Diffstat (limited to 'llvm/tools')
-rw-r--r--llvm/tools/llvm-ar/llvm-ar.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp
index 34663c250a5..ab2a2f18ec5 100644
--- a/llvm/tools/llvm-ar/llvm-ar.cpp
+++ b/llvm/tools/llvm-ar/llvm-ar.cpp
@@ -379,10 +379,8 @@ namespace {
class NewArchiveIterator {
bool IsNewMember;
SmallString<16> MemberName;
- union {
- object::Archive::child_iterator OldI;
- std::vector<std::string>::const_iterator NewI;
- };
+ object::Archive::child_iterator OldI;
+ std::vector<std::string>::const_iterator NewI;
public:
NewArchiveIterator(object::Archive::child_iterator I, Twine Name);
OpenPOWER on IntegriCloud