git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cstdlib: Remove redundant pasto code protected by __GXX_EXPERIMENTAL_CXX0X__. 

2012-10-05  Paolo Carlini  <paolo.carlini@oracle.com>

	* 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
This commit is contained in:
Paolo Carlini 2012-10-05 17:39:32 +00:00 committed by Paolo Carlini
parent 870128f21d
commit 67dd8d5938
5 changed files with 13 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2012-10-05 Paolo Carlini <paolo.carlini@oracle.com>
* 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 <marc.glisse@inria.fr> 2012-10-05 Marc Glisse <marc.glisse@inria.fr>
PR libstdc++/54686 PR libstdc++/54686

6
libstdc++-v3/include/c_global/ccomplex
View File

@ -1,6 +1,6 @@
// <ccomplex> -*- C++ -*- // <ccomplex> -*- 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 // 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 // software; you can redistribute it and/or modify it under the
@ -35,10 +35,6 @@
# include <bits/c++0x_warning.h> # include <bits/c++0x_warning.h>
#endif #endif
#if defined(_GLIBCXX_INCLUDE_AS_TR1)
# error C++0x header cannot be included from TR1 header
#endif
#include <complex> #include <complex>
#endif #endif

7
libstdc++-v3/include/c_global/cfloat
View File

@ -1,8 +1,6 @@
// -*- C++ -*- forwarding header. // -*- C++ -*- forwarding header.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, // Copyright (C) 1997-2012 Free Software Foundation, Inc.
// 2006, 2007, 2008, 2009, 2010
// Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
@ -46,9 +44,6 @@
#define _GLIBCXX_CFLOAT 1 #define _GLIBCXX_CFLOAT 1
#ifdef __GXX_EXPERIMENTAL_CXX0X__ #ifdef __GXX_EXPERIMENTAL_CXX0X__
# if defined(_GLIBCXX_INCLUDE_AS_TR1)
# error C++0x header cannot be included from TR1 header
# endif
# ifndef DECIMAL_DIG # ifndef DECIMAL_DIG
# define DECIMAL_DIG __DECIMAL_DIG__ # define DECIMAL_DIG __DECIMAL_DIG__
# endif # endif

33
libstdc++-v3/include/c_global/cstdlib
View File

@ -1,8 +1,6 @@
// -*- C++ -*- forwarding header. // -*- C++ -*- forwarding header.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, // Copyright (C) 1997-2012 Free Software Foundation, Inc.
// 2006, 2007, 2008, 2009, 2010, 2011
// Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
@ -221,35 +219,6 @@ namespace std
using ::__gnu_cxx::strtold; using ::__gnu_cxx::strtold;
} // namespace std } // 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_USE_C99
#endif // !_GLIBCXX_HOSTED #endif // !_GLIBCXX_HOSTED

19
libstdc++-v3/include/c_global/cwctype
View File

@ -1,8 +1,6 @@
// -*- C++ -*- forwarding header. // -*- C++ -*- forwarding header.
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, // Copyright (C) 1997-2012 Free Software Foundation, Inc.
// 2006, 2007, 2008, 2009, 2010
// Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
@ -109,19 +107,4 @@ namespace std
#endif //_GLIBCXX_USE_WCHAR_T #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 #endif // _GLIBCXX_CWCTYPE