Commit d530142d by Jonathan Wakely Committed by Jonathan Wakely

re PR libstdc++/21609 (array_allocator vs rebind & templated constructor)

	PR libstdc++/21609
	* include/ext/array_allocator.h: Add deprecated attribute.

From-SVN: r207280
parent e8902891
...@@ -38,6 +38,9 @@ ...@@ -38,6 +38,9 @@
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise. Likewise.
PR libstdc++/21609
* include/ext/array_allocator.h: Add deprecated attribute.
2014-01-28 Jonathan Wakely <jwakely@redhat.com> 2014-01-28 Jonathan Wakely <jwakely@redhat.com>
Kyle Lippincott <spectral@google.com> Kyle Lippincott <spectral@google.com>
......
...@@ -95,7 +95,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -95,7 +95,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void void
destroy(pointer __p) { __p->~_Tp(); } destroy(pointer __p) { __p->~_Tp(); }
#endif #endif
}; } _GLIBCXX_DEPRECATED;
/** /**
* @brief An allocator that uses previously allocated memory. * @brief An allocator that uses previously allocated memory.
...@@ -128,7 +128,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -128,7 +128,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
public: public:
template<typename _Tp1, typename _Array1 = _Array> template<typename _Tp1, typename _Array1 = _Array>
struct rebind struct rebind
{ typedef array_allocator<_Tp1, _Array1> other; }; {
typedef array_allocator<_Tp1, _Array1> other _GLIBCXX_DEPRECATED;
} _GLIBCXX_DEPRECATED;
array_allocator(array_type* __array = 0) _GLIBCXX_USE_NOEXCEPT array_allocator(array_type* __array = 0) _GLIBCXX_USE_NOEXCEPT
: _M_array(__array), _M_used(size_type()) { } : _M_array(__array), _M_used(size_type()) { }
...@@ -152,7 +154,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -152,7 +154,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_used += __n; _M_used += __n;
return __ret; return __ret;
} }
}; } _GLIBCXX_DEPRECATED;
template<typename _Tp, typename _Array> template<typename _Tp, typename _Array>
inline bool inline bool
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment