diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Parse/ParseTemplate.cpp | 12 | ||||
| -rw-r--r-- | lib/Sema/SemaType.cpp | 7 |
2 files changed, 6 insertions, 13 deletions
diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp index 3d68a4ab9d..92fe4a5f33 100644 --- a/lib/Parse/ParseTemplate.cpp +++ b/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. diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index dc08320cad..cee4ed67a1 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -2488,11 +2488,8 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state, // it expands those parameter packs. if (T->containsUnexpandedParameterPack()) T = Context.getPackExpansionType(T, llvm::Optional<unsigned>()); - else - S.Diag(D.getEllipsisLoc(), - LangOpts.CPlusPlus0x - ? diag::warn_cxx98_compat_variadic_templates - : diag::ext_variadic_templates); + else if (!LangOpts.CPlusPlus0x) + S.Diag(D.getEllipsisLoc(), diag::ext_variadic_templates); break; case Declarator::FileContext: |