From d530142ddb708112ad0a7dabaf74f9b4072fa120 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 29 Jan 2014 20:43:44 +0000 Subject: re PR libstdc++/21609 (array_allocator vs rebind & templated constructor) PR libstdc++/21609 * include/ext/array_allocator.h: Add deprecated attribute. From-SVN: r207280 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/ext/array_allocator.h | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c066773..e0f3693 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -38,6 +38,9 @@ * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Likewise. + PR libstdc++/21609 + * include/ext/array_allocator.h: Add deprecated attribute. + 2014-01-28 Jonathan Wakely Kyle Lippincott diff --git a/libstdc++-v3/include/ext/array_allocator.h b/libstdc++-v3/include/ext/array_allocator.h index f584b5b..f807495 100644 --- a/libstdc++-v3/include/ext/array_allocator.h +++ b/libstdc++-v3/include/ext/array_allocator.h @@ -95,7 +95,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void destroy(pointer __p) { __p->~_Tp(); } #endif - }; + } _GLIBCXX_DEPRECATED; /** * @brief An allocator that uses previously allocated memory. @@ -128,7 +128,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION public: template 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 : _M_array(__array), _M_used(size_type()) { } @@ -152,7 +154,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_used += __n; return __ret; } - }; + } _GLIBCXX_DEPRECATED; template inline bool -- cgit v1.1