summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseTemplate.cpp
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2017-12-04 20:27:34 +0000
committerAaron Ballman <aaron@aaronballman.com>2017-12-04 20:27:34 +0000
commitc351fba69e24ca65fb8c4ae3ce240642555495d7 (patch)
tree31152a9420f1881f2241277093a696858c852ed3 /clang/lib/Parse/ParseTemplate.cpp
parent800259c98d6fe81fefabb38c01a79504f2652cf2 (diff)
downloadbcm5719-llvm-c351fba69e24ca65fb8c4ae3ce240642555495d7.tar.gz
bcm5719-llvm-c351fba69e24ca65fb8c4ae3ce240642555495d7.zip
Now that C++17 is official (https://www.iso.org/standard/68564.html), start changing the C++1z terminology over to C++17. NFC intended, these are all mechanical changes.
llvm-svn: 319688
Diffstat (limited to 'clang/lib/Parse/ParseTemplate.cpp')
-rw-r--r--clang/lib/Parse/ParseTemplate.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp
index fcb1142b9c2..fe17d65a27a 100644
--- a/clang/lib/Parse/ParseTemplate.cpp
+++ b/clang/lib/Parse/ParseTemplate.cpp
@@ -590,10 +590,10 @@ Parser::ParseTemplateTemplateParameter(unsigned Depth, unsigned Position) {
const Token &Next = Tok.is(tok::kw_struct) ? NextToken() : Tok;
if (Tok.is(tok::kw_typename)) {
Diag(Tok.getLocation(),
- getLangOpts().CPlusPlus1z
+ getLangOpts().CPlusPlus17
? diag::warn_cxx14_compat_template_template_param_typename
: diag::ext_template_template_param_typename)
- << (!getLangOpts().CPlusPlus1z
+ << (!getLangOpts().CPlusPlus17
? FixItHint::CreateReplacement(Tok.getLocation(), "class")
: FixItHint());
} else if (Next.isOneOf(tok::identifier, tok::comma, tok::greater,
OpenPOWER on IntegriCloud