diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 62bbf8b9452..34968e3a758 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,19 @@ +2011-01-31 Benjamin Kosnik + + * include/bits/c++config (_GLIBCXX_DEPRECATED): To + _GLIBCXX_USE_DEPRECATED. + (_GLIBCXX_DEPRECATED_ATTR): To _GLIBCXX_DEPRECATED. + * doc/xml/manual/using.xml: Same. + * include/std/memory: Same. + * include/std/streambuf: Same. + * include/bits/shared_ptr.h: Same. + * include/bits/unique_ptr.h: Same. + * include/bits/shared_ptr_base.h: Same. + * include/bits/stl_function.h: Same. + * include/tr1/shared_ptr.h: Same. + * include/backward/auto_ptr.h: Same. + * include/backward/binders.h: Same. + 2011-01-30 Benjamin Kosnik PR libstdc++/36104 part four diff --git a/libstdc++-v3/doc/xml/manual/using.xml b/libstdc++-v3/doc/xml/manual/using.xml index 6e3123e11b1..02498e21cd8 100644 --- a/libstdc++-v3/doc/xml/manual/using.xml +++ b/libstdc++-v3/doc/xml/manual/using.xml @@ -834,7 +834,7 @@ g++ -Winvalid-pch -I. -include stdc++.h -H -g -O2 hello.cc -o test.exe - _GLIBCXX_DEPRECATED + _GLIBCXX_USE_DEPRECATED Defined by default. Not configurable. ABI-changing. Turning this off diff --git a/libstdc++-v3/include/backward/auto_ptr.h b/libstdc++-v3/include/backward/auto_ptr.h index e14906b36fe..60d4e623e02 100644 --- a/libstdc++-v3/include/backward/auto_ptr.h +++ b/libstdc++-v3/include/backward/auto_ptr.h @@ -1,6 +1,6 @@ // auto_ptr implementation -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010, 2011 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 @@ -51,7 +51,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION explicit auto_ptr_ref(_Tp1* __p): _M_ptr(__p) { } - } _GLIBCXX_DEPRECATED_ATTR; + } _GLIBCXX_DEPRECATED; /** @@ -278,7 +278,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template operator auto_ptr<_Tp1>() throw() { return auto_ptr<_Tp1>(this->release()); } - } _GLIBCXX_DEPRECATED_ATTR; + } _GLIBCXX_DEPRECATED; // _GLIBCXX_RESOLVE_LIB_DEFECTS // 541. shared_ptr template assignment and void @@ -287,7 +287,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { public: typedef void element_type; - } _GLIBCXX_DEPRECATED_ATTR; + } _GLIBCXX_DEPRECATED; _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/include/backward/binders.h b/libstdc++-v3/include/backward/binders.h index faadd0ddebd..75e091eb6db 100644 --- a/libstdc++-v3/include/backward/binders.h +++ b/libstdc++-v3/include/backward/binders.h @@ -1,6 +1,6 @@ // Functor implementations -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -119,7 +119,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typename _Operation::result_type operator()(typename _Operation::second_argument_type& __x) const { return op(value, __x); } - } _GLIBCXX_DEPRECATED_ATTR; + } _GLIBCXX_DEPRECATED; /// One of the @link binders binder functors@endlink. template @@ -154,7 +154,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typename _Operation::result_type operator()(typename _Operation::first_argument_type& __x) const { return op(__x, value); } - } _GLIBCXX_DEPRECATED_ATTR; + } _GLIBCXX_DEPRECATED; /// One of the @link binders binder functors@endlink. template diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 101d6b50d23..1d46c132e95 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -74,16 +74,16 @@ #endif // Macros for deprecated attributes. +// _GLIBCXX_USE_DEPRECATED // _GLIBCXX_DEPRECATED -// _GLIBCXX_DEPRECATED_ATTR -#ifndef _GLIBCXX_DEPRECATED -# define _GLIBCXX_DEPRECATED 1 +#ifndef _GLIBCXX_USE_DEPRECATED +# define _GLIBCXX_USE_DEPRECATED 1 #endif #if defined(__DEPRECATED) && defined(__GXX_EXPERIMENTAL_CXX0X__) -# define _GLIBCXX_DEPRECATED_ATTR __attribute__ ((__deprecated__)) +# define _GLIBCXX_DEPRECATED __attribute__ ((__deprecated__)) #else -# define _GLIBCXX_DEPRECATED_ATTR +# define _GLIBCXX_DEPRECATED #endif #if __cplusplus diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index 628863c1264..97d123f942b 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -1,6 +1,6 @@ // shared_ptr and weak_ptr implementation -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010, 2011 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 @@ -246,7 +246,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION explicit shared_ptr(const weak_ptr<_Tp1>& __r) : __shared_ptr<_Tp>(__r) { } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED template shared_ptr(std::auto_ptr<_Tp1>&& __r) : __shared_ptr<_Tp>(std::move(__r)) { } @@ -272,7 +272,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED template shared_ptr& operator=(std::auto_ptr<_Tp1>&& __r) diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index fa85280a490..acea7443bf1 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -1,6 +1,6 @@ // shared_ptr and weak_ptr implementation details -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010, 2011 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 @@ -525,7 +525,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED // Special case for auto_ptr<_Tp> to provide the strong guarantee. template explicit @@ -844,7 +844,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __enable_shared_from_this_helper(_M_refcount, __tmp, __tmp); } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED // Postcondition: use_count() == 1 and __r.get() == 0 template __shared_ptr(std::auto_ptr<_Tp1>&& __r) @@ -872,7 +872,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED template __shared_ptr& operator=(std::auto_ptr<_Tp1>&& __r) diff --git a/libstdc++-v3/include/bits/stl_function.h b/libstdc++-v3/include/bits/stl_function.h index 7660d15b3ae..88655fc55c3 100644 --- a/libstdc++-v3/include/bits/stl_function.h +++ b/libstdc++-v3/include/bits/stl_function.h @@ -1,6 +1,6 @@ // Functor implementations -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -727,7 +727,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_DEPRECATED +#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED # include #endif diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index 339176a4bd5..5e8ab90ce12 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -1,6 +1,6 @@ // unique_ptr implementation -*- C++ -*- -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009, 2010, 2011 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 @@ -154,7 +154,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _M_t(__u.release(), std::forward(__u.get_deleter())) { } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED template::value && std::is_same<_Dp, diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index bfc038de326..791ffe048a9 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -1,7 +1,7 @@ // -*- C++ -*- // Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -// 2009, 2010 +// 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -79,7 +79,7 @@ # include # include # include -# if _GLIBCXX_DEPRECATED +# if _GLIBCXX_USE_DEPRECATED # include # endif # include diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf index 51d89ce9a89..0121ac2de98 100644 --- a/libstdc++-v3/include/std/streambuf +++ b/libstdc++-v3/include/std/streambuf @@ -748,7 +748,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION overflow(int_type /* __c */ = traits_type::eof()) { return traits_type::eof(); } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED // Annex D.6 public: /** diff --git a/libstdc++-v3/include/tr1/shared_ptr.h b/libstdc++-v3/include/tr1/shared_ptr.h index 13b03842e5c..c42084c9539 100644 --- a/libstdc++-v3/include/tr1/shared_ptr.h +++ b/libstdc++-v3/include/tr1/shared_ptr.h @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010, 2011 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 @@ -591,7 +591,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_ptr = __r._M_ptr; } -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_DEPRECATED +#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED // Postcondition: use_count() == 1 and __r.get() == 0 template explicit @@ -637,7 +637,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_DEPRECATED +#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED template __shared_ptr& operator=(std::auto_ptr<_Tp1>& __r) @@ -1014,7 +1014,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION shared_ptr(const weak_ptr<_Tp1>& __r) : __shared_ptr<_Tp>(__r) { } -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_DEPRECATED +#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED template explicit shared_ptr(std::auto_ptr<_Tp1>& __r) @@ -1041,7 +1041,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_DEPRECATED +#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED template shared_ptr& operator=(std::auto_ptr<_Tp1>& __r)