aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/ParseTemplate.cpp
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@google.com>2011-10-14 00:04:00 +0000
committerJeffrey Yasskin <jyasskin@google.com>2011-10-14 00:04:00 +0000
commitf38eaa4748ee6164d5e36309fecef71765ff8b2b (patch)
tree3012e793eaa3b273e88b1cfcfa5752eacc1abae2 /lib/Parse/ParseTemplate.cpp
parent5fa065b55bd622f20656e0de3b1f122951146784 (diff)
Revert the -Wc++98-compat flag because dgregor doesn't like it.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141921 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseTemplate.cpp')
-rw-r--r--lib/Parse/ParseTemplate.cpp12
1 files changed, 4 insertions, 8 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.