This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[v3] adjust deprecated
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org, libstdc++ at gcc dot gnu dot org
- Date: Mon, 31 Jan 2011 13:31:16 -0800
- Subject: [v3] adjust deprecated
now consistent with the rest of the attributes.
tested x86/linux
-benjamin
2011-01-31 Benjamin Kosnik <bkoz@redhat.com>
* 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.
Index: doc/xml/manual/using.xml
===================================================================
--- doc/xml/manual/using.xml (revision 169443)
+++ doc/xml/manual/using.xml (working copy)
@@ -834,7 +834,7 @@
</para>
<variablelist>
- <varlistentry><term><code>_GLIBCXX_DEPRECATED</code></term>
+ <varlistentry><term><code>_GLIBCXX_USE_DEPRECATED</code></term>
<listitem>
<para>
Defined by default. Not configurable. ABI-changing. Turning this off
Index: include/std/memory
===================================================================
--- include/std/memory (revision 169443)
+++ include/std/memory (working copy)
@@ -1,7 +1,7 @@
// <memory> -*- 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 <type_traits>
# include <functional>
# include <debug/debug.h>
-# if _GLIBCXX_DEPRECATED
+# if _GLIBCXX_USE_DEPRECATED
# include <backward/auto_ptr.h>
# endif
# include <bits/unique_ptr.h>
Index: include/std/streambuf
===================================================================
--- include/std/streambuf (revision 169443)
+++ include/std/streambuf (working copy)
@@ -748,7 +748,7 @@
overflow(int_type /* __c */ = traits_type::eof())
{ return traits_type::eof(); }
-#if _GLIBCXX_DEPRECATED
+#if _GLIBCXX_USE_DEPRECATED
// Annex D.6
public:
/**
Index: include/bits/shared_ptr.h
===================================================================
--- include/bits/shared_ptr.h (revision 169443)
+++ include/bits/shared_ptr.h (working copy)
@@ -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 @@
explicit shared_ptr(const weak_ptr<_Tp1>& __r)
: __shared_ptr<_Tp>(__r) { }
-#if _GLIBCXX_DEPRECATED
+#if _GLIBCXX_USE_DEPRECATED
template<typename _Tp1>
shared_ptr(std::auto_ptr<_Tp1>&& __r)
: __shared_ptr<_Tp>(std::move(__r)) { }
@@ -272,7 +272,7 @@
return *this;
}
-#if _GLIBCXX_DEPRECATED
+#if _GLIBCXX_USE_DEPRECATED
template<typename _Tp1>
shared_ptr&
operator=(std::auto_ptr<_Tp1>&& __r)
Index: include/bits/unique_ptr.h
===================================================================
--- include/bits/unique_ptr.h (revision 169443)
+++ include/bits/unique_ptr.h (working copy)
@@ -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 @@
: _M_t(__u.release(), std::forward<deleter_type>(__u.get_deleter()))
{ }
-#if _GLIBCXX_DEPRECATED
+#if _GLIBCXX_USE_DEPRECATED
template<typename _Up, typename = typename
std::enable_if<std::is_convertible<_Up*, _Tp*>::value
&& std::is_same<_Dp,
Index: include/bits/c++config
===================================================================
--- include/bits/c++config (revision 169443)
+++ include/bits/c++config (working copy)
@@ -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
Index: include/bits/shared_ptr_base.h
===================================================================
--- include/bits/shared_ptr_base.h (revision 169443)
+++ include/bits/shared_ptr_base.h (working copy)
@@ -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 @@
}
}
-#if _GLIBCXX_DEPRECATED
+#if _GLIBCXX_USE_DEPRECATED
// Special case for auto_ptr<_Tp> to provide the strong guarantee.
template<typename _Tp>
explicit
@@ -844,7 +844,7 @@
__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<typename _Tp1>
__shared_ptr(std::auto_ptr<_Tp1>&& __r)
@@ -872,7 +872,7 @@
return *this;
}
-#if _GLIBCXX_DEPRECATED
+#if _GLIBCXX_USE_DEPRECATED
template<typename _Tp1>
__shared_ptr&
operator=(std::auto_ptr<_Tp1>&& __r)
Index: include/bits/stl_function.h
===================================================================
--- include/bits/stl_function.h (revision 169443)
+++ include/bits/stl_function.h (working copy)
@@ -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_END_NAMESPACE_VERSION
} // namespace
-#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_DEPRECATED
+#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED
# include <backward/binders.h>
#endif
Index: include/tr1/shared_ptr.h
===================================================================
--- include/tr1/shared_ptr.h (revision 169443)
+++ include/tr1/shared_ptr.h (working copy)
@@ -1,6 +1,6 @@
// <tr1/shared_ptr.h> -*- 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 @@
_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<typename _Tp1>
explicit
@@ -637,7 +637,7 @@
return *this;
}
-#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_DEPRECATED
+#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED
template<typename _Tp1>
__shared_ptr&
operator=(std::auto_ptr<_Tp1>& __r)
@@ -1014,7 +1014,7 @@
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<typename _Tp1>
explicit
shared_ptr(std::auto_ptr<_Tp1>& __r)
@@ -1041,7 +1041,7 @@
return *this;
}
-#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_DEPRECATED
+#if !defined(__GXX_EXPERIMENTAL_CXX0X__) || _GLIBCXX_USE_DEPRECATED
template<typename _Tp1>
shared_ptr&
operator=(std::auto_ptr<_Tp1>& __r)
Index: include/backward/auto_ptr.h
===================================================================
--- include/backward/auto_ptr.h (revision 169443)
+++ include/backward/auto_ptr.h (working copy)
@@ -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 @@
explicit
auto_ptr_ref(_Tp1* __p): _M_ptr(__p) { }
- } _GLIBCXX_DEPRECATED_ATTR;
+ } _GLIBCXX_DEPRECATED;
/**
@@ -278,7 +278,7 @@
template<typename _Tp1>
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 @@
{
public:
typedef void element_type;
- } _GLIBCXX_DEPRECATED_ATTR;
+ } _GLIBCXX_DEPRECATED;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
Index: include/backward/binders.h
===================================================================
--- include/backward/binders.h (revision 169443)
+++ include/backward/binders.h (working copy)
@@ -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 @@
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<typename _Operation, typename _Tp>
@@ -154,7 +154,7 @@
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<typename _Operation, typename _Tp>