From 67dd8d59381b8f0c3edf1191d408e13187392a21 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 5 Oct 2012 17:39:32 +0000 Subject: [PATCH] cstdlib: Remove redundant pasto code protected by __GXX_EXPERIMENTAL_CXX0X__. 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. From-SVN: r192137 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/include/c_global/ccomplex | 6 +----- libstdc++-v3/include/c_global/cfloat | 7 +------ libstdc++-v3/include/c_global/cstdlib | 33 +-------------------------------- libstdc++-v3/include/c_global/cwctype | 19 +------------------ 5 files changed, 13 insertions(+), 61 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6ae10a8..9342f56 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +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. + 2012-10-05 Marc Glisse PR libstdc++/54686 diff --git a/libstdc++-v3/include/c_global/ccomplex b/libstdc++-v3/include/c_global/ccomplex index b1117e8..0109ec1 100644 --- a/libstdc++-v3/include/c_global/ccomplex +++ b/libstdc++-v3/include/c_global/ccomplex @@ -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 diff --git a/libstdc++-v3/include/c_global/cfloat b/libstdc++-v3/include/c_global/cfloat index 1be81d3..2bc7883 100644 --- a/libstdc++-v3/include/c_global/cfloat +++ b/libstdc++-v3/include/c_global/cfloat @@ -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 diff --git a/libstdc++-v3/include/c_global/cstdlib b/libstdc++-v3/include/c_global/cstdlib index f4785b4..8a5aaf1 100644 --- a/libstdc++-v3/include/c_global/cstdlib +++ b/libstdc++-v3/include/c_global/cstdlib @@ -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 @@ namespace std 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 diff --git a/libstdc++-v3/include/c_global/cwctype b/libstdc++-v3/include/c_global/cwctype index e417b68..52fb440 100644 --- a/libstdc++-v3/include/c_global/cwctype +++ b/libstdc++-v3/include/c_global/cwctype @@ -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 @@ namespace std #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 -- 2.7.4