diff options
| author | glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-02-22 10:24:11 +0000 |
|---|---|---|
| committer | glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-02-22 10:24:11 +0000 |
| commit | c4b451a14b5fb7c48082aac2b1890fd09e8647e7 (patch) | |
| tree | efea88bc06d580abc854a58e6c37e0114dbddadc /libstdc++-v3 | |
| parent | 1f62da87e4a4756f979af3eb9a86ea5aaf80d8c4 (diff) | |
| download | ppe42-gcc-c4b451a14b5fb7c48082aac2b1890fd09e8647e7.tar.gz ppe42-gcc-c4b451a14b5fb7c48082aac2b1890fd09e8647e7.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208041 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 15 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_deque.h | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 933239cef7e..50ed52f2543 100644 --- 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 0f4d0e9b8a7..add8742a102 100644 --- 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 /** |
