From patchwork Tue Feb 1 17:15:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3] libstdc++/47560 Date: Tue, 01 Feb 2011 07:15:30 -0000 From: Benjamin Kosnik X-Patchwork-Id: 81339 Message-Id: <20110201091530.3575a8eb@shotwell> To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Oops: quick audit on config/* directory shows that there was some spurious artifact from the recent namespace re-write. Actually, this is better than before because there's no need for a duplicate _GLIBCXX_VISIBILITY_PSEUDO definition. tested x86/linux -benjamin 2011-02-01 Benjamin Kosnik PR libstdc++/47560 * config/os/hpux/os_defines.h: Remove use of macros on namespace. Index: config/os/hpux/os_defines.h =================================================================== --- config/os/hpux/os_defines.h (revision 169490) +++ config/os/hpux/os_defines.h (working copy) @@ -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 @@ #endif _GLIBCXX_END_EXTERN_C -_GLIBCXX_END_NAMESPACE_VERSION -} // namespace +} // namespace std #define _GLIBCXX_USE_LONG_LONG 1