From 32fe396e05443a67367a3c454b7c6d574ea7e58e Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 18 Aug 2011 17:29:10 +0000 Subject: [PATCH] Properly define __cplusplus (PR libstdc++-v3/1773) PR libstdc++/1773 * init.c (cpp_init_builtins): Define __cplusplus 19971L. From-SVN: r177877 --- libcpp/ChangeLog | 5 +++++ libcpp/init.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 4ee03638d15..81b3a94bb50 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,8 @@ +2011-08-18 Rainer Orth + + PR libstdc++/1773 + * init.c (cpp_init_builtins): Define __cplusplus 19971L. + 2011-08-18 Joseph Myers * include/cpplib.h (struct cpp_options): Fix typo. diff --git a/libcpp/init.c b/libcpp/init.c index 1cbb9dda2f0..93f12d0d71f 100644 --- 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) -- 2.34.1