From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 29 Jan 2014 20:43:44 +0000 (+0000)
Subject: 	PR libstdc++/21609
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2b08775c6385145a3e128f1642bdcdf1b9c30f0;p=thirdparty%2Fgcc.git

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207280 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c06677340283..e0f36932bd91 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  <jwakely@redhat.com>
 	    Kyle Lippincott  <spectral@google.com>
 
diff --git a/libstdc++-v3/include/ext/array_allocator.h b/libstdc++-v3/include/ext/array_allocator.h
index f584b5b78798..f807495a9e00 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<typename _Tp1, typename _Array1 = _Array>
         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<typename _Tp, typename _Array>
     inline bool