diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-18 17:29:10 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-18 17:29:10 +0000 |
| commit | 985e7f1028ffb3c6e18d66e9c9ae8d0baaa3f74b (patch) | |
| tree | cd3c7602c4e64e443acc5511a27cc44f66612bfb /libcpp | |
| parent | d2a15bb86011faf9aee1115ccd7964c9b1eb14e0 (diff) | |
| download | gcc-985e7f1028ffb3c6e18d66e9c9ae8d0baaa3f74b.tar.gz | |
Properly define __cplusplus (PR libstdc++-v3/1773)
PR libstdc++/1773
* init.c (cpp_init_builtins): Define __cplusplus 19971L.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177877 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 5 | ||||
| -rw-r--r-- | libcpp/init.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 <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 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) |