commit dbd4d4c8375ee79dd9da290695f292ddcb65c3d3
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Jun 16 15:16:56 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Jun 16 15:16:56 2014 +0000
tree 139a40abe8cd0e46cad649d500491b8c273e3cc0
parent 9252057a070fc8f3800a83b0b6bb90bcdf6c64a8

Add -std=c++1z flag for C++17 features.

llvm-svn: 211030

clang/lib/Frontend/InitPreprocessor.cpp

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