diff options
| author | Alp Toker <alp@nuanti.com> | 2014-05-28 12:20:14 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-05-28 12:20:14 +0000 |
| commit | 2afa8780d62a9334fdbdb0c46f814d211e2083b3 (patch) | |
| tree | d1ee6166d6845e905784c21d0dd9f6d0eb2f88c4 /clang/lib/Sema/SemaCXXScopeSpec.cpp | |
| parent | a9c452121a395908ed3f8e4034fc55254933bbd1 (diff) | |
| download | bcm5719-llvm-2afa8780d62a9334fdbdb0c46f814d211e2083b3.tar.gz bcm5719-llvm-2afa8780d62a9334fdbdb0c46f814d211e2083b3.zip | |
Consolidate some note diagnostics
These note diags have the same message and can be unified further but for now
let's just bring them together.
Incidental change: Display a source range in the final attr diagnostic.
llvm-svn: 209728
Diffstat (limited to 'clang/lib/Sema/SemaCXXScopeSpec.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaCXXScopeSpec.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaCXXScopeSpec.cpp b/clang/lib/Sema/SemaCXXScopeSpec.cpp index 8c423352589..a70aca2ad86 100644 --- a/clang/lib/Sema/SemaCXXScopeSpec.cpp +++ b/clang/lib/Sema/SemaCXXScopeSpec.cpp @@ -532,9 +532,7 @@ bool Sema::BuildCXXNestedNameSpecifier(Scope *S, Diag(R.getNameLoc(), diag::err_expected_class_or_namespace) << &Identifier << getLangOpts().CPlusPlus; if (NamedDecl *ND = R.getAsSingle<NamedDecl>()) - Diag(ND->getLocation(), - diag::note_expected_class_or_namespace_declared_here) - << &Identifier; + Diag(ND->getLocation(), diag::note_entity_declared_at) << &Identifier; return true; } } @@ -718,9 +716,7 @@ bool Sema::BuildCXXNestedNameSpecifier(Scope *S, Diag(IdentifierLoc, diag::err_expected_class_or_namespace) << &Identifier << getLangOpts().CPlusPlus; if (NamedDecl *ND = Found.getAsSingle<NamedDecl>()) - Diag(ND->getLocation(), - diag::note_expected_class_or_namespace_declared_here) - << &Identifier; + Diag(ND->getLocation(), diag::note_entity_declared_at) << &Identifier; } } else if (SS.isSet()) Diag(IdentifierLoc, diag::err_no_member) << &Identifier << LookupCtx |
