diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-02-01 15:11:08 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-02-01 15:11:08 +0000 |
| commit | 13fc08e44e4e4893b2b3f1f3d7c1c9c40d6b8b7d (patch) | |
| tree | 81cce9b3e76b7f238df371c1f957eee5bfce932b | |
| parent | 2b8427ca54e818cc874316719378d1803838513a (diff) | |
| download | gcc-13fc08e44e4e4893b2b3f1f3d7c1c9c40d6b8b7d.zip gcc-13fc08e44e4e4893b2b3f1f3d7c1c9c40d6b8b7d.tar.gz gcc-13fc08e44e4e4893b2b3f1f3d7c1c9c40d6b8b7d.tar.bz2 | |
re PR libstdc++/64883 (FAIL: 17_intro/headers/c++*/all_attributes.cc (test for excess errors) on x86_64-apple-darwin10)
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_global/cstdio | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_std/cstdio | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc | 7 |
4 files changed, 16 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c23fa0d..67cfb60 100644 --- 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 ef024bf..d1c958b 100644 --- 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 1f8ae7c..37f01ca 100644 --- 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 c7ed8ae..76a935e 100644 --- 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 |