commit a47f101a74ecb12e5d04b913e3ea2b494b4f2db0
author Douglas Gregor <doug.gregor@gmail.com> Thu Aug 06 04:09:28 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Thu Aug 06 04:09:28 2009 +0000
tree 193e706b033496d76a0d2c05dbce4ac750ecd91f
parent ab938ec9138157c01b3e93e39b3ef2065804704f

Predefine __cplusplus to the right value (199711L), except when in GNU mode.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@78283 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Frontend/InitPreprocessor.cpp

diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
index 3ab5931..877c788 100644
--- a/lib/Frontend/InitPreprocessor.cpp
+++ b/lib/Frontend/InitPreprocessor.cpp
@@ -305,7 +305,13 @@
     DefineBuiltinMacro(Buf, "__EXCEPTIONS=1");
     DefineBuiltinMacro(Buf, "__GNUG__=4");
     DefineBuiltinMacro(Buf, "__GXX_WEAK__=1");
-    DefineBuiltinMacro(Buf, "__cplusplus=1");
+    if (LangOpts.GNUMode)
+      DefineBuiltinMacro(Buf, "__cplusplus=1");
+    else 
+      // C++ [cpp.predefined]p1:
+      //   The name_ _cplusplusis defined to the value199711Lwhen compiling a 
+      //   C++ translation unit.
+      DefineBuiltinMacro(Buf, "__cplusplus=199711L");
     DefineBuiltinMacro(Buf, "__private_extern__=extern");
   }