OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Benjamin Kosnik 2011-02-01 17:11:17 +00:00 committed by Benjamin Kosnik
parent 926bcf2265
commit 04f089357e
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
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.

13
libstdc++-v3/config/os/hpux/os_defines.h
View File

@ -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