Properly define __cplusplus (PR libstdc++-v3/1773)

	PR libstdc++/1773
	* init.c (cpp_init_builtins): Define __cplusplus 19971L.

From-SVN: r177877

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 4ee03638d15acf0f23f886ab0556282a8c57ac0e..81b3a94bb50e533f87b4e9019238fdd9b96e2358 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       PR libstdc++/1773
+       * init.c (cpp_init_builtins): Define __cplusplus 19971L.
+
 2011-08-18  Joseph Myers  <joseph@codesourcery.com>
 
        * include/cpplib.h (struct cpp_options): Fix typo.

diff --git a/libcpp/init.c b/libcpp/init.c
index 1cbb9dda2f05ffe3b453440dc87bb85aa2f60daf..93f12d0d71f8f18be505cff2f80e4008a015a38a 100644 (file)
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -455,7 +455,7 @@ cpp_init_builtins (cpp_reader *pfile, int hosted)
     _cpp_define_builtin (pfile, "__STDC__ 1");
 
   if (CPP_OPTION (pfile, cplusplus))
-    _cpp_define_builtin (pfile, "__cplusplus 1");
+    _cpp_define_builtin (pfile, "__cplusplus 199711L");
   else if (CPP_OPTION (pfile, lang) == CLK_ASM)
     _cpp_define_builtin (pfile, "__ASSEMBLER__ 1");
   else if (CPP_OPTION (pfile, lang) == CLK_STDC94)