summaryrefslogtreecommitdiffstats
path: root/clang/include
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2009-10-14 23:50:59 +0000
committerDouglas Gregor <dgregor@apple.com>2009-10-14 23:50:59 +0000
commitba8e1ac3a1241e42d5e38cc52b4333d536c7cd68 (patch)
treecbbcf57d43cae194b018da16022f362b9039da17 /clang/include
parente47f5a76ccd74c13d5c319e12720275ef58a84fc (diff)
downloadbcm5719-llvm-ba8e1ac3a1241e42d5e38cc52b4333d536c7cd68.tar.gz
bcm5719-llvm-ba8e1ac3a1241e42d5e38cc52b4333d536c7cd68.zip
CheckTemplateSpecializationScope isn't going to be used for explicit
instantiations, since the requirements are too different from those for template specializations. Simplify it slightly. llvm-svn: 84156
Diffstat (limited to 'clang/include')
-rw-r--r--clang/include/clang/Basic/DiagnosticSemaKinds.td15
1 files changed, 6 insertions, 9 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 4845314743f..b1222a3f84e 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -936,18 +936,15 @@ def err_template_arg_extra_parens : Error<
// C++ template specialization
def err_template_spec_unknown_kind : Error<
- "can only provide an explicit %select{<error>|<error>|specialization|"
- "instantiation|instantiation}0 for a class template, function template, or "
- "a member function, static data member, or member class of a class template">;
+ "can only provide an explicit specialization for a class template, function "
+ "template, or a member function, static data member, or member class of a "
+ "class template">;
def note_specialized_entity : Note<
- "explicitly %select{<error>|<error>|specialized|instantiated|instantiated}0 "
- "declaration is here">;
+ "explicitly specialized declaration is here">;
def err_template_spec_decl_function_scope : Error<
- "explicit %select{<error>|<error>|specialization|instantiation|"
- "instantiation}0 of %1 in function scope">;
+ "explicit specialization of %0 in function scope">;
def err_template_spec_decl_class_scope : Error<
- "explicit %select{<error>|<error>|specialization|instantiation|"
- "instantiation}0 of %1 in class scope">;
+ "explicit specialization of %0 in class scope">;
def err_template_spec_decl_out_of_scope_global : Error<
"%select{class template|class template partial|function template|member "
"function|static data member|member class}0 specialization of %1 must "
OpenPOWER on IntegriCloud