[llvm-branch-commits] [cfe-branch] r121558 - /cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 10 15:38:02 2010
New Revision: 121558

URL: http://llvm.org/viewvc/llvm-project?rev=121558&view=rev
Log:
Merge r121290:
--
Author: Douglas Gregor <dgregor at apple.com>
Date:   Wed Dec 8 22:02:28 2010 +0000

    Put the "'typename' occurs outside of a template" and "'template'
    keyword occurs outside of a template" diagnostics under
    -WC++0x-extensions.

Modified:
    cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td

Modified: cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td?rev=121558&r1=121557&r2=121558&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td Fri Dec 10 15:38:02 2010
@@ -1756,7 +1756,7 @@
 def err_typename_missing : Error<
   "missing 'typename' prior to dependent type name '%0%1'">;
 def ext_typename_outside_of_template : ExtWarn<
-  "'typename' occurs outside of a template">;
+  "'typename' occurs outside of a template">, InGroup<CXX0x>;
 
 def err_template_kw_refers_to_non_template : Error<
     "%0 following the 'template' keyword does not refer to a template">;
@@ -1769,7 +1769,7 @@
 def err_template_kw_missing : Error<
   "missing 'template' keyword prior to dependent template name '%0%1'">;
 def ext_template_outside_of_template : ExtWarn<
-  "'template' keyword outside of a template">;
+  "'template' keyword outside of a template">, InGroup<CXX0x>;
 
 // C++0x Variadic Templates
 def err_template_param_pack_default_arg : Error<