summaryrefslogtreecommitdiff
path: root/tools/llvm-ar
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
commit33ccfb2d261dbb2c5099669c1712df789ba8aedc (patch)
treec2c7b9726736d860e41e464c81584e01bbcfc3b3 /tools/llvm-ar
parent34ac52d9377b104c83f80184f284199d68732f07 (diff)
downloadllvm-33ccfb2d261dbb2c5099669c1712df789ba8aedc.tar.gz
llvm-33ccfb2d261dbb2c5099669c1712df789ba8aedc.tar.bz2
llvm-33ccfb2d261dbb2c5099669c1712df789ba8aedc.tar.xz
Fix the build with c++03.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186198 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-ar')
-rw-r--r--tools/llvm-ar/llvm-ar.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index 34663c250a..ab2a2f18ec 100644
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/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);