re PR libstdc++/64883 (FAIL: 17_intro/headers/c++*/all_attributes.cc (test for excess...

	PR libstdc++/64883
	* include/c_global/cstdio (gets): Use __deprecated__ attribute instead
	of deprecated.
	* include/c_std/cstdio (gets): Likewise.
	* testsuite/17_intro/headers/c++1998/all_attributes.cc: Avoid clashing
	with attributes used in darwin headers.

From-SVN: r220318

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c23fa0d4040582eb9687db3a52bfb40402baf409..67cfb60ddb3b385abcc5bf0891c3a66775f85216 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2015-02-01  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/64883
+       * include/c_global/cstdio (gets): Use __deprecated__ attribute instead
+       of deprecated.
+       * include/c_std/cstdio (gets): Likewise.
+       * testsuite/17_intro/headers/c++1998/all_attributes.cc: Avoid clashing
+       with attributes used in darwin headers.
+
 2015-01-29  Jakub Jelinek  <jakub@redhat.com>
 
        * acinclude.m4 (VTV_CYGMIN): Use x$vtv_cygmin = xyes instead of

diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio
index ef024bf8dbe36f4da39807fedc9d32d6f23e852c..d1c958b6383424c785401be482cca90cb7a5ebea 100644 (file)
--- a/libstdc++-v3/include/c_global/cstdio
+++ b/libstdc++-v3/include/c_global/cstdio
@@ -45,7 +45,7 @@
 #define _GLIBCXX_CSTDIO 1
 
 #ifndef _GLIBCXX_HAVE_GETS
-extern "C" char* gets (char* __s) __attribute__((deprecated));
+extern "C" char* gets (char* __s) __attribute__((__deprecated__));
 #endif
 
 // Get rid of those macros defined in <stdio.h> in lieu of real functions.

diff --git a/libstdc++-v3/include/c_std/cstdio b/libstdc++-v3/include/c_std/cstdio
index 1f8ae7c90e82834b1d2dcde39d7d0e662aec4178..37f01cad70ac2d0501a52d0964ed310690e0785a 100644 (file)
--- a/libstdc++-v3/include/c_std/cstdio
+++ b/libstdc++-v3/include/c_std/cstdio
@@ -45,7 +45,7 @@
 #include <stdio.h>
 
 #ifndef _GLIBCXX_HAVE_GETS
-extern "C" char* gets (char* __s) __attribute__((deprecated));
+extern "C" char* gets (char* __s) __attribute__((__deprecated__));
 #endif
 
 // Get rid of those macros defined in <stdio.h> in lieu of real functions.

diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc
index c7ed8aea01c7039672a88ca73a1d51109b66a99e..76a935e1186085158a19c76891407a3df96c20ff 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc
@@ -22,8 +22,11 @@
 // Don't test 'const' because it is reserved anyway.
 #define abi_tag 1
 #define always_inline 1
-#define deprecated 1
-#define noreturn 1
+#ifndef __APPLE__
+// darwin headers use these, see PR 64883
+# define deprecated 1
+# define noreturn 1
+#endif
 #define packed 1
 #define pure 1
 #define unused 1