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 | 933c66b6956e91ef9017b28dd499b317aba83b7b (patch) | |
| tree | 3481ff68df8822f47732cdf695795f14fd7ded45 /lib/Sema/SemaTemplateInstantiate.cpp | |
| parent | ac89a4542ae4635c1d511c235c30eead4da96b04 (diff) | |
Bug fix: note diagnosis on expression narrowing should say "variable template" instead of "static data member" when appropriate
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188409 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiate.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiate.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp index 83c4c115fa..9f84fc665b 100644 --- a/lib/Sema/SemaTemplateInstantiate.cpp +++ b/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)) { |