stl_deque.h (_Deque_alloc_base): Change order of member declarations to avoid compile...

2002-07-08  Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>

	* 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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dd89bfaa69be103ae60d2ce53540e332b8b1376a..fbaca326bb7f517cbfe9a36c93da059fd8e24f0e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-08  Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>
+
+       * 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  <pme@gcc.gnu.org>
 
        * 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 cbf8ad345779af2c50981752acf26446a5290b16..6eb6a8c17405fb39c85a6b4755ce6c98dcec47e7 100644 (file)
--- 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