re PR libstdc++/60308 (std::deque leaks memory)

2014-02-22  Marc Glisse  <marc.glisse@inria.fr>

	PR libstdc++/60308
	* include/bits/stl_deque.h (_Deque_base::_Deque_base(const
	allocator_type&)): Remove redundant call to _M_initialize_map.
	(deque::deque(const allocator_type&)): Initialize _Base with a
	constructor that calls _M_initialize_map.

	Partial revert:

	2013-09-20  Marc Glisse  <marc.glisse@inria.fr>
	PR libstdc++/58338
	(_Deque_base) [_Deque_base(const allocator_type&)]: Add missing call to
	_M_initialize_map.

From-SVN: r208041

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 933239c..50ed52f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,18 @@
+2014-02-22  Marc Glisse  <marc.glisse@inria.fr>
+
+       PR libstdc++/60308
+       * include/bits/stl_deque.h (_Deque_base::_Deque_base(const
+       allocator_type&)): Remove redundant call to _M_initialize_map.
+       (deque::deque(const allocator_type&)): Initialize _Base with a
+       constructor that calls _M_initialize_map.
+
+       Partial revert:
+
+       2013-09-20  Marc Glisse  <marc.glisse@inria.fr>
+       PR libstdc++/58338
+       (_Deque_base) [_Deque_base(const allocator_type&)]: Add missing call to
+       _M_initialize_map.
+
 2014-02-21  Ed Smith-Rowland  <3dw4rd@verizon.net>
 
        Rename testsuite directory shared_mutex to shared_timed_mutex

diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h
index 0f4d0e9..add8742 100644 (file)
--- a/libstdc++-v3/include/bits/stl_deque.h
+++ b/libstdc++-v3/include/bits/stl_deque.h
@@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 
       _Deque_base(const allocator_type& __a)
       : _M_impl(__a)
-      { _M_initialize_map(0); }
+      { }
 
 #if __cplusplus >= 201103L
       _Deque_base(_Deque_base&& __x)
@@ -793,7 +793,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
        */
       explicit
       deque(const allocator_type& __a)
-      : _Base(__a) { }
+      : _Base(__a, 0) { }
 
 #if __cplusplus >= 201103L
       /**