commit 4b0cad0bb8731409c181f9a2cc9d266bb08321f9
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 20 20:12:48 2017 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 20 20:12:48 2017 +0000
tree 613673b8d08a9041078b2551a74962baf02bc3fb
parent d61548471c7f31aa9d24359011e8e4cf87d7b831

Bump __cplusplus for C++17 to 201703L per the C++17 DIS.

llvm-svn: 298299

clang/lib/Frontend/InitPreprocessor.cpp

diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
index 749dd9b..88be773 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -374,9 +374,11 @@
     else if (!LangOpts.GNUMode && LangOpts.Digraphs)
       Builder.defineMacro("__STDC_VERSION__", "199409L");
   } else {
-    // FIXME: Use correct value for C++17.
+    // C++17 [cpp.predefined]p1:
+    //   The name __cplusplus is defined to the value 201703L when compiling a
+    //   C++ translation unit.
     if (LangOpts.CPlusPlus1z)
-      Builder.defineMacro("__cplusplus", "201406L");
+      Builder.defineMacro("__cplusplus", "201703L");
     // C++1y [cpp.predefined]p1:
     //   The name __cplusplus is defined to the value 201402L when compiling a
     //   C++ translation unit.