diff options
Diffstat (limited to 'lib/Sema/SemaDeclCXX.cpp')
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 0ca75df591..39f79757be 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -5532,7 +5532,6 @@ Decl *Sema::ActOnStartNamespaceDef(Scope *NamespcScope, // For anonymous namespace, take the location of the left brace. SourceLocation Loc = II ? IdentLoc : LBrace; bool IsInline = InlineLoc.isValid(); - bool IsInvalid = false; bool IsStd = false; bool AddToKnown = false; Scope *DeclRegionScope = NamespcScope->getParent(); @@ -5587,7 +5586,6 @@ Decl *Sema::ActOnStartNamespaceDef(Scope *NamespcScope, Diag(Loc, diag::err_redefinition_different_kind) << II; Diag(PrevDecl->getLocation(), diag::note_previous_definition); - IsInvalid = true; // Continue on to push Namespc as current DeclContext and return it. } else if (II->isStr("std") && CurContext->getRedeclContext()->isTranslationUnit()) { @@ -5617,8 +5615,7 @@ Decl *Sema::ActOnStartNamespaceDef(Scope *NamespcScope, Diag(Loc, diag::err_inline_namespace_mismatch) << IsInline; Diag(PrevNS->getLocation(), diag::note_previous_definition); - IsInvalid = true; - + // Recover by ignoring the new namespace's inline status. IsInline = PrevNS->isInline(); } |