cpp.texi: Remove __GXX_EXPERIMENTAL_CXX1Y__.

2013-04-24  Paolo Carlini  <paolo.carlini@oracle.com>

	* doc/cpp.texi: Remove __GXX_EXPERIMENTAL_CXX1Y__.

/c-family
2013-04-24  Paolo Carlini  <paolo.carlini@oracle.com>

	* c-cppbuiltin.c (c_cpp_builtins): Do not define
	__GXX_EXPERIMENTAL_CXX1Y__.

/testsuite
2013-04-24  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp1y/cxx1y_macro.C: Remove.

From-SVN: r198258

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 45f918a08b6297f75c1841df42f2d402c7dbfb2f..e43523795696fb5ae27336bfeceb2ad95aeea8aa 100644 (file)
--- 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 275b20dfb350e85f9e9ed7e29292b0ceb72c1f4b..b246b2be45d817b35151a99e19588b4ad201bd3c 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+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>
 

diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
index 255a90ae134a3d947243827bd98e5923d25ec44a..3e210d90e0b3d30e810a0be31c0c5b0728d75e0d 100644 (file)
--- 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 71979eefe5fcd6e6780d65fa364d8c97eb4b4ae5..4e7b05cd159f6bde8b20ae695d28ee73b83c4039 100644 (file)
--- 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 c3cd691f1175a22ed080efa6a20b3f8a325fe7d2..b199baaa17198ec3598daf9e3a2f036c61c965c6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/gcc/testsuite/g++.dg/cpp1y/cxx1y_macro.C b/gcc/testsuite/g++.dg/cpp1y/cxx1y_macro.C
deleted file mode 100644 (file)
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