diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-09-30 23:16:08 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-09-30 23:16:08 +0000 |
| commit | 360cb2570ed525bf7e44e758a7feabe2b0a7ec1d (patch) | |
| tree | a4522c699f17725cfb83714f2a60a3058e9fe79a /clang/lib/Sema | |
| parent | 8dbaf5cb4de16d7fe5de9329c7407dbd1b211648 (diff) | |
| download | bcm5719-llvm-360cb2570ed525bf7e44e758a7feabe2b0a7ec1d.tar.gz bcm5719-llvm-360cb2570ed525bf7e44e758a7feabe2b0a7ec1d.zip | |
Fix bogus "inline namespace cannot be reopened as non-inline" diagnostic to
just warn that the second declaration is missing the 'inline' keyword. This is
valid, and we shouldn't be suggesting otherwise.
llvm-svn: 282981
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 6c952e01822..133f1f47cc4 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -8089,7 +8089,7 @@ static void DiagnoseNamespaceInlineMismatch(Sema &S, SourceLocation KeywordLoc, S.Diag(Loc, diag::warn_inline_namespace_reopened_noninline) << FixItHint::CreateInsertion(KeywordLoc, "inline "); else - S.Diag(Loc, diag::err_inline_namespace_mismatch) << *IsInline; + S.Diag(Loc, diag::err_inline_namespace_mismatch); S.Diag(PrevNS->getLocation(), diag::note_previous_definition); *IsInline = PrevNS->isInline(); |
