commit c351fba69e24ca65fb8c4ae3ce240642555495d7
author Aaron Ballman <aaron@aaronballman.com> Mon Dec 04 20:27:34 2017 +0000
committer Aaron Ballman <aaron@aaronballman.com> Mon Dec 04 20:27:34 2017 +0000
tree 31152a9420f1881f2241277093a696858c852ed3
parent 800259c98d6fe81fefabb38c01a79504f2652cf2

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

clang/lib/Parse/ParseStmt.cpp

diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index e8cf7d5..3f25610 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -1128,7 +1128,7 @@
 
   bool IsConstexpr = false;
   if (Tok.is(tok::kw_constexpr)) {
-    Diag(Tok, getLangOpts().CPlusPlus1z ? diag::warn_cxx14_compat_constexpr_if
+    Diag(Tok, getLangOpts().CPlusPlus17 ? diag::warn_cxx14_compat_constexpr_if
                                         : diag::ext_constexpr_if);
     IsConstexpr = true;
     ConsumeToken();
@@ -1613,7 +1613,7 @@
       ForRangeInit.RangeExpr = ParseExpression();
 
     Diag(Loc, diag::err_for_range_identifier)
-      << ((getLangOpts().CPlusPlus11 && !getLangOpts().CPlusPlus1z)
+      << ((getLangOpts().CPlusPlus11 && !getLangOpts().CPlusPlus17)
               ? FixItHint::CreateInsertion(Loc, "auto &&")
               : FixItHint());