diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 4 | ||||
| -rw-r--r-- | gcc/doc/cpp.texi | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/cxx1y_macro.C | 5 |
6 files changed, 14 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 45f918a..e435237 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> + + * doc/cpp.texi: Remove __GXX_EXPERIMENTAL_CXX1Y__. + 2013-04-24 Vladimir Makarov <vmakarov@redhat.com> * rtl.h (struct rtx_def): Add comment for field jump. diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 275b20d..b246b2b 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,4 +1,9 @@ 2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> + + * c-cppbuiltin.c (c_cpp_builtins): Do not define + __GXX_EXPERIMENTAL_CXX1Y__. + +2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> Manuel Lopez-Ibanez <manu@gcc.gnu.org> * c.opt ([Wpointer-arith]): Enabled by -Wpedantic, as documented. diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 255a90a..3e210d9 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -713,10 +713,8 @@ c_cpp_builtins (cpp_reader *pfile) cpp_define (pfile, "__DEPRECATED"); if (flag_rtti) cpp_define (pfile, "__GXX_RTTI"); - if (cxx_dialect == cxx0x) + if (cxx_dialect >= cxx0x) cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX0X__"); - if (cxx_dialect >= cxx1y) - cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX1Y__"); } /* Note that we define this for C as well, so that we know if __attribute__((cleanup)) will interface with EH. */ diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi index 71979ee..4e7b05c 100644 --- a/gcc/doc/cpp.texi +++ b/gcc/doc/cpp.texi @@ -2319,13 +2319,6 @@ features likely to be included in C++0x are available. Note that these features are experimental, and may change or be removed in future versions of GCC. -@item __GXX_EXPERIMENTAL_CXX1Y__ -This macro is defined when compiling a C++ source file with the option -@option{-std=c++1y} or @option{-std=gnu++1y}. It indicates that some -features likely to be included in C++1y are available. Note that these -features are experimental, and may change or be removed in future -versions of GCC. - @item __GXX_WEAK__ This macro is defined when compiling a C++ source file. It has the value 1 if the compiler will use weak symbols, COMDAT sections, or diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c3cd691..b199baa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> + * g++.dg/cpp1y/cxx1y_macro.C: Remove. + +2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> + * c-c++-common/Wpointer-arith-1.c: New. 2013-04-24 Paolo Carlini <paolo.carlini@oracle.com> diff --git a/gcc/testsuite/g++.dg/cpp1y/cxx1y_macro.C b/gcc/testsuite/g++.dg/cpp1y/cxx1y_macro.C deleted file mode 100644 index 35783b2..0000000 --- a/gcc/testsuite/g++.dg/cpp1y/cxx1y_macro.C +++ /dev/null @@ -1,5 +0,0 @@ -// { dg-options "-std=c++1y" } - -#ifndef __GXX_EXPERIMENTAL_CXX1Y__ -#error -#endif |