diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-08 15:04:44 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-08 15:04:44 +0000 |
| commit | bec7f54b1f793ca696923d45700fa3b34d792268 (patch) | |
| tree | 9e989e50078e8a83aff07c3e28d2b8faa68f194b | |
| parent | d209dd969a54c41ff1fa5746d5d9074fea31036e (diff) | |
| download | ppe42-gcc-bec7f54b1f793ca696923d45700fa3b34d792268.tar.gz ppe42-gcc-bec7f54b1f793ca696923d45700fa3b34d792268.zip | |
2008-10-08 Bob Walters <bob.s.walters@gmail.com>
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@140977 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 <bob.s.walters@gmail.com> + + * 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 <jason@redhat.com> 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); |
