diff options
| author | Jason Merrill <jason@redhat.com> | 2011-10-31 15:34:26 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-10-31 15:34:26 -0400 |
| commit | 1fb80b0c5359f696aa61d537e25b7901d8b56ff7 (patch) | |
| tree | 1b67899479635e50951367854c15bfb0ef27354d /libcpp | |
| parent | 97e3ad20b12a5a317d98085df6f18a87f681f377 (diff) | |
| download | gcc-1fb80b0c5359f696aa61d537e25b7901d8b56ff7.tar.gz gcc-1fb80b0c5359f696aa61d537e25b7901d8b56ff7.tar.bz2 gcc-1fb80b0c5359f696aa61d537e25b7901d8b56ff7.zip | |
re PR libstdc++/1773 (__cplusplus defined to 1, should be 199711L)
PR libstdc++/1773
* init.c (cpp_init_builtins): Set __cplusplus for C++11.
From-SVN: r180708
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 3 | ||||
| -rw-r--r-- | libcpp/init.c | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 8013364e6be..64ed4683669 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,5 +1,8 @@ 2011-10-31 Jason Merrill <jason@redhat.com> + PR libstdc++/1773 + * init.c (cpp_init_builtins): Set __cplusplus for C++11. + PR c++/50920 * include/cpplib.h (enum c_lang): Rename CLK_CXX0X to CLK_CXX11, CLK_GNUCXX0X to CLK_GNUCXX11. diff --git a/libcpp/init.c b/libcpp/init.c index bbaa8ae10c3..9101b34e086 100644 --- a/libcpp/init.c +++ b/libcpp/init.c @@ -461,7 +461,13 @@ cpp_init_builtins (cpp_reader *pfile, int hosted) _cpp_define_builtin (pfile, "__STDC__ 1"); if (CPP_OPTION (pfile, cplusplus)) - _cpp_define_builtin (pfile, "__cplusplus 199711L"); + { + if (CPP_OPTION (pfile, lang) == CLK_CXX11 + || CPP_OPTION (pfile, lang) == CLK_GNUCXX11) + _cpp_define_builtin (pfile, "__cplusplus 201103L"); + else + _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) |