From 08bf5bb38b4518c6cf1a38676418abe4864b2896 Mon Sep 17 00:00:00 2001 From: Bob Walters Date: Wed, 8 Oct 2008 15:04:44 +0000 Subject: [PATCH] stl_vector.h (_Vector_base<>::_Vector_impl::_M_start, [...]): Use _Tp_alloc_type::pointer. 2008-10-08 Bob Walters * include/bits/stl_vector.h (_Vector_base<>::_Vector_impl::_M_start, _M_finish, _M_end_of_storage, _Vector_base<>::_M_allocate, _M_deallocate): Use _Tp_alloc_type::pointer. From-SVN: r140977 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/stl_vector.h | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3b2762620f7..80c942ccad0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2008-10-08 Bob Walters + + * include/bits/stl_vector.h (_Vector_base<>::_Vector_impl::_M_start, + _M_finish, _M_end_of_storage, _Vector_base<>::_M_allocate, + _M_deallocate): Use _Tp_alloc_type::pointer. + 2008-10-07 Jason Merrill PR libstdc++/37761 diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 28222f408f3..37bd21803d4 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -78,9 +78,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) struct _Vector_impl : public _Tp_alloc_type { - _Tp* _M_start; - _Tp* _M_finish; - _Tp* _M_end_of_storage; + typename _Tp_alloc_type::pointer _M_start; + typename _Tp_alloc_type::pointer _M_finish; + typename _Tp_alloc_type::pointer _M_end_of_storage; _Vector_impl() : _Tp_alloc_type(), _M_start(0), _M_finish(0), _M_end_of_storage(0) @@ -140,12 +140,12 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) public: _Vector_impl _M_impl; - _Tp* + typename _Tp_alloc_type::pointer _M_allocate(size_t __n) { return __n != 0 ? _M_impl.allocate(__n) : 0; } void - _M_deallocate(_Tp* __p, size_t __n) + _M_deallocate(typename _Tp_alloc_type::pointer __p, size_t __n) { if (__p) _M_impl.deallocate(__p, __n);