diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2011-02-01 17:11:17 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2011-02-01 17:11:17 +0000 |
| commit | 04f089357e00b4840b8e5c1757f5c45275dd5af2 (patch) | |
| tree | 0129b29b0e5fe18f0e7a40f04f933f7d02ba9c47 | |
| parent | 926bcf22655470b2eef57a62a66ef2c7d824bf9c (diff) | |
| download | gcc-04f089357e00b4840b8e5c1757f5c45275dd5af2.zip gcc-04f089357e00b4840b8e5c1757f5c45275dd5af2.tar.gz gcc-04f089357e00b4840b8e5c1757f5c45275dd5af2.tar.bz2 | |
re PR libstdc++/47560 (FAIL: abi/header_cxxabi.c (test for excess errors))
2011-02-01 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/47560
* config/os/hpux/os_defines.h: Remove use of macros on namespace.
From-SVN: r169491
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/os/hpux/os_defines.h | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ea2cdf0..9bcfa23 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2011-02-01 Benjamin Kosnik <bkoz@redhat.com> + PR libstdc++/47560 + * config/os/hpux/os_defines.h: Remove use of macros on namespace. + +2011-02-01 Benjamin Kosnik <bkoz@redhat.com> + * scripts/run_doxygen: Allow doxygen 1.7.0 again. * doc/doxygen/user.cfg.in (PDF_HYPERLINKS): Re-enable. (COMPACT_LATEX): Enable. diff --git a/libstdc++-v3/config/os/hpux/os_defines.h b/libstdc++-v3/config/os/hpux/os_defines.h index a41f301..0010000 100644 --- a/libstdc++-v3/config/os/hpux/os_defines.h +++ b/libstdc++-v3/config/os/hpux/os_defines.h @@ -1,6 +1,6 @@ // Specific definitions for HPUX -*- C++ -*- -// Copyright (C) 2000, 2002, 2004, 2005, 2008, 2009, 2010 +// Copyright (C) 2000, 2002, 2004, 2005, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -37,11 +37,6 @@ // Use macro form of ctype functions to ensure __SB_masks is defined. #define _SB_CTYPE_MACROS 1 -// This would be defaulted in the main c++config header if we didn't -// define it here, but it has to be defined before we can use the -// namespace macros, so we have to define it to nothing here instead. -#define _GLIBCXX_PSEUDO_VISIBILITY(V) - /* HP-UX, for reasons unknown choose to use a different name for the string to [unsigned] long long conversion routines. @@ -63,9 +58,8 @@ We also force _GLIBCXX_USE_LONG_LONG here so that we don't have to bastardize configure to deal with this sillyness. */ -namespace std _GLIBCXX_VISIBILITY(default) +namespace std { -_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_EXTERN_C #ifndef __LP64__ @@ -81,8 +75,7 @@ _GLIBCXX_BEGIN_EXTERN_C #endif _GLIBCXX_END_EXTERN_C -_GLIBCXX_END_NAMESPACE_VERSION -} // namespace +} // namespace std #define _GLIBCXX_USE_LONG_LONG 1 |