From patchwork Fri Oct 5 17:42:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3] Remove cruft ;) Date: Fri, 05 Oct 2012 07:42:20 -0000 From: Paolo Carlini X-Patchwork-Id: 189542 Message-Id: <506F1BFC.4060008@oracle.com> To: "gcc-patches@gcc.gnu.org" Cc: libstdc++ Hi, remove some cruft noticed by Marc (and myself). Sanity checked x86_64-linux, committed to mainline. Thanks, Paolo. ////////////////// 2012-10-05 Paolo Carlini * include/c_global/cstdlib: Remove redundant pasto code protected by __GXX_EXPERIMENTAL_CXX0X__. * include/c_global/cwctype: Likewise. * include/c_global/ccomplex: Remove uses of obsolete macro _GLIBCXX_INCLUDE_AS_TR1. * include/c_global/cfloat: Likewise. Index: include/c_global/cstdlib =================================================================== --- include/c_global/cstdlib (revision 192130) +++ include/c_global/cstdlib (working copy) @@ -1,8 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010, 2011 -// Free Software Foundation, Inc. +// Copyright (C) 1997-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -221,35 +219,6 @@ using ::__gnu_cxx::strtold; } // namespace std -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - -namespace std -{ -#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC - // types - using std::lldiv_t; - - // functions - using std::llabs; - using std::lldiv; -#endif - - using std::atoll; - using std::strtoll; - using std::strtoull; - - using std::strtof; - using std::strtold; - - // overloads - using std::abs; -#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC - using std::div; -#endif -} // namespace std - -#endif // __GXX_EXPERIMENTAL_CXX0X__ - #endif // _GLIBCXX_USE_C99 #endif // !_GLIBCXX_HOSTED Index: include/c_global/cfloat =================================================================== --- include/c_global/cfloat (revision 192130) +++ include/c_global/cfloat (working copy) @@ -1,8 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 -// Free Software Foundation, Inc. +// Copyright (C) 1997-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -46,9 +44,6 @@ #define _GLIBCXX_CFLOAT 1 #ifdef __GXX_EXPERIMENTAL_CXX0X__ -# if defined(_GLIBCXX_INCLUDE_AS_TR1) -# error C++0x header cannot be included from TR1 header -# endif # ifndef DECIMAL_DIG # define DECIMAL_DIG __DECIMAL_DIG__ # endif Index: include/c_global/ccomplex =================================================================== --- include/c_global/ccomplex (revision 192130) +++ include/c_global/ccomplex (working copy) @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2007-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -35,10 +35,6 @@ # include #endif -#if defined(_GLIBCXX_INCLUDE_AS_TR1) -# error C++0x header cannot be included from TR1 header -#endif - #include #endif Index: include/c_global/cwctype =================================================================== --- include/c_global/cwctype (revision 192130) +++ include/c_global/cwctype (working copy) @@ -1,8 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 -// Free Software Foundation, Inc. +// Copyright (C) 1997-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -109,19 +107,4 @@ #endif //_GLIBCXX_USE_WCHAR_T -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - -#ifdef _GLIBCXX_USE_WCHAR_T - -namespace std -{ -#if _GLIBCXX_HAVE_ISWBLANK - using std::iswblank; -#endif -} // namespace - -#endif // _GLIBCXX_USE_WCHAR_T - -#endif // __GXX_EXPERIMENTAL_CXX0X__ - #endif // _GLIBCXX_CWCTYPE