From 7766810445ed766f899299a120eaf4e221f4b684 Mon Sep 17 00:00:00 2001 From: Peter Schmid Date: Mon, 8 Jul 2002 12:24:52 +0000 Subject: [PATCH] stl_deque.h (_Deque_alloc_base): Change order of member declarations to avoid compiler warnings and restore 3.1 ABI. 2002-07-08 Peter Schmid * include/bits/stl_deque.h (_Deque_alloc_base): Change order of member declarations to avoid compiler warnings and restore 3.1 ABI. From-SVN: r55325 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/stl_deque.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index dd89bfaa69b..fbaca326bb7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2002-07-08 Peter Schmid + + * include/bits/stl_deque.h (_Deque_alloc_base): Change order of + member declarations to avoid compiler warnings and restore 3.1 ABI. + 2002-07-08 Phil Edwards * docs/html/23_containers/howto.html: Link to dk_std::vector paper diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index cbf8ad34577..6eb6a8c1740 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -385,10 +385,10 @@ protected: _M_deallocate_map(_Tp** __p, size_t __n) { _M_map_allocator.deallocate(__p, __n); } - _Tp** _M_map; - size_t _M_map_size; allocator_type _M_node_allocator; _Map_allocator_type _M_map_allocator; + _Tp** _M_map; + size_t _M_map_size; }; /// @if maint Specialization for instanceless allocators. @endif -- 2.30.2