From de8a1046338902e6c0ab31c8f22d062debe1f9b8 Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Fri, 14 Oct 2011 00:04:00 +0000 Subject: Revert the -Wc++98-compat flag because dgregor doesn't like it. llvm-svn: 141921 --- clang/lib/Parse/ParseTemplate.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'clang/lib/Parse/ParseTemplate.cpp') diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp index 3d68a4ab9db..92fe4a5f335 100644 --- a/clang/lib/Parse/ParseTemplate.cpp +++ b/clang/lib/Parse/ParseTemplate.cpp @@ -475,10 +475,8 @@ Decl *Parser::ParseTypeParameter(unsigned Depth, unsigned Position) { Ellipsis = true; EllipsisLoc = ConsumeToken(); - Diag(EllipsisLoc, - getLang().CPlusPlus0x - ? diag::warn_cxx98_compat_variadic_templates - : diag::ext_variadic_templates); + if (!getLang().CPlusPlus0x) + Diag(EllipsisLoc, diag::ext_variadic_templates); } // Grab the template parameter name (if given) @@ -549,10 +547,8 @@ Parser::ParseTemplateTemplateParameter(unsigned Depth, unsigned Position) { if (Tok.is(tok::ellipsis)) { EllipsisLoc = ConsumeToken(); - Diag(EllipsisLoc, - getLang().CPlusPlus0x - ? diag::warn_cxx98_compat_variadic_templates - : diag::ext_variadic_templates); + if (!getLang().CPlusPlus0x) + Diag(EllipsisLoc, diag::ext_variadic_templates); } // Get the identifier, if given. -- cgit v1.2.3