diff options
| -rw-r--r-- | include/clang/AST/DeclCXX.h | 11 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h index ca416771a0..c8a703f38f 100644 --- a/include/clang/AST/DeclCXX.h +++ b/include/clang/AST/DeclCXX.h @@ -1596,23 +1596,20 @@ public: FieldDecl *getMember() const { if (isMemberInitializer()) return Initializee.get<FieldDecl*>(); - else - return 0; + return 0; } FieldDecl *getAnyMember() const { if (isMemberInitializer()) return Initializee.get<FieldDecl*>(); - else if (isIndirectMemberInitializer()) + if (isIndirectMemberInitializer()) return Initializee.get<IndirectFieldDecl*>()->getAnonField(); - else - return 0; + return 0; } IndirectFieldDecl *getIndirectMember() const { if (isIndirectMemberInitializer()) return Initializee.get<IndirectFieldDecl*>(); - else - return 0; + return 0; } SourceLocation getMemberLocation() const { diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index db2dd22e68..8aeb8fb33f 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -3080,7 +3080,8 @@ bool CheckRedundantUnionInit(Sema &S, S.Diag(En.second->getSourceLocation(), diag::note_previous_initializer) << 0 << En.second->getSourceRange(); return true; - } else if (!En.first) { + } + if (!En.first) { En.first = Child; En.second = Init; } |