diff options
| author | Larisse Voufo <lvoufo@google.com> | 2013-08-14 20:15:02 +0000 |
|---|---|---|
| committer | Larisse Voufo <lvoufo@google.com> | 2013-08-14 20:15:02 +0000 |
| commit | dbd65779649eb0a12e63c84c7f9d2cf9d3411a46 (patch) | |
| tree | 9d137e9e0007f6a75965d7eac5419935b1e20341 /clang/lib/Sema/SemaTemplateInstantiate.cpp | |
| parent | 9b49f225007945d70cd0c903db010b398f24f0e4 (diff) | |
| download | bcm5719-llvm-dbd65779649eb0a12e63c84c7f9d2cf9d3411a46.tar.gz bcm5719-llvm-dbd65779649eb0a12e63c84c7f9d2cf9d3411a46.zip | |
Bug fix: note diagnosis on expression narrowing should say "variable template" instead of "static data member" when appropriate
llvm-svn: 188409
Diffstat (limited to 'clang/lib/Sema/SemaTemplateInstantiate.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiate.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index 83c4c115fab..9f84fc665b1 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -524,7 +524,9 @@ void Sema::PrintInstantiationStack() { << Active->InstantiationRange; } else if (VarDecl *VD = dyn_cast<VarDecl>(D)) { Diags.Report(Active->PointOfInstantiation, - diag::note_template_static_data_member_def_here) + VD->isStaticDataMember()? + diag::note_template_static_data_member_def_here + : diag::note_template_variable_def_here) << VD << Active->InstantiationRange; } else if (EnumDecl *ED = dyn_cast<EnumDecl>(D)) { |
