diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2012-01-10 18:26:14 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2012-01-10 18:26:14 +0000 |
| commit | 02577fffafce0d88c7ad71502bb9e9bb628b2c0c (patch) | |
| tree | 1c7604ee71851518b010f66d8d7c1419d43347bb /lib/Sema/SemaDeclCXX.cpp | |
| parent | d3e29ef3e0c3f2f70ec41c83e68c271f970e1852 (diff) | |
Remove a set, but unused variable. Found with GCC's warning.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147864 91177308-0d34-0410-b5e6-96231b3b80d8
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(); } |