commit b115e5dda2020bcba2730838e92c100fe75dd1e3
author Richard Smith <richard-llvm@metafoo.co.uk> Sun Aug 13 23:37:29 2017 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Sun Aug 13 23:37:29 2017 +0000
tree 3fcebb44ea3f751ef20fbc923cd94f36766d5da1
parent cbaaa295f033714ccbf4e5b54cc447f50d29011c

Rename cxx1z -> cxx17 across all diagnostic IDs.

llvm-svn: 310805

clang/lib/Parse/ParseDeclCXX.cpp

diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index 2301284..dcba364 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -605,7 +605,7 @@
 
   if (TryConsumeToken(tok::ellipsis, D.EllipsisLoc))
     Diag(Tok.getLocation(), getLangOpts().CPlusPlus1z ?
-         diag::warn_cxx1z_compat_using_declaration_pack :
+         diag::warn_cxx17_compat_using_declaration_pack :
          diag::ext_using_declaration_pack);
 
   return false;
@@ -723,7 +723,7 @@
 
   if (DeclsInGroup.size() > 1)
     Diag(Tok.getLocation(), getLangOpts().CPlusPlus1z ?
-         diag::warn_cxx1z_compat_multi_using_declaration :
+         diag::warn_cxx17_compat_multi_using_declaration :
          diag::ext_multi_using_declaration);
 
   // Eat ';'.

clang/lib/Parse/ParseExprCXX.cpp

diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp
index 56b0327..b955062 100644
--- a/clang/lib/Parse/ParseExprCXX.cpp
+++ b/clang/lib/Parse/ParseExprCXX.cpp
@@ -1054,7 +1054,7 @@
                                   DeclSpec &DS) {
   if (ConstexprLoc.isValid()) {
     P.Diag(ConstexprLoc, !P.getLangOpts().CPlusPlus1z
-                             ? diag::ext_constexpr_on_lambda_cxx1z
+                             ? diag::ext_constexpr_on_lambda_cxx17
                              : diag::warn_cxx14_compat_constexpr_on_lambda);
     const char *PrevSpec = nullptr;
     unsigned DiagID = 0;