diff options
| author | Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> | 2002-07-08 12:24:52 +0000 |
|---|---|---|
| committer | Phil Edwards <pme@gcc.gnu.org> | 2002-07-08 12:24:52 +0000 |
| commit | 7766810445ed766f899299a120eaf4e221f4b684 (patch) | |
| tree | e3fa200a40270b2707000b064f7aab293fba9242 | |
| parent | 57c905fa73ae2f04e5e1803ab05eaeb43d6d44c4 (diff) | |
| download | gcc-7766810445ed766f899299a120eaf4e221f4b684.zip gcc-7766810445ed766f899299a120eaf4e221f4b684.tar.gz gcc-7766810445ed766f899299a120eaf4e221f4b684.tar.bz2 | |
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 <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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 dd89bfa..fbaca32 100644 --- 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 cbf8ad3..6eb6a8c 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 |