git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stl_vector.h (_Vector_base<>::_Vector_impl::_M_start, [...]): Use _Tp_alloc_type::pointer. 

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.

From-SVN: r140977
This commit is contained in:
Bob Walters 2008-10-08 15:04:44 +00:00 committed by Paolo Carlini
parent b7f58d5d19
commit 08bf5bb38b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -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> 2008-10-07 Jason Merrill <jason@redhat.com>
PR libstdc++/37761 PR libstdc++/37761

10
libstdc++-v3/include/bits/stl_vector.h
View File

@ -78,9 +78,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
struct _Vector_impl struct _Vector_impl
: public _Tp_alloc_type : public _Tp_alloc_type
{ {
_Tp* _M_start; typename _Tp_alloc_type::pointer _M_start;
_Tp* _M_finish; typename _Tp_alloc_type::pointer _M_finish;
_Tp* _M_end_of_storage; typename _Tp_alloc_type::pointer _M_end_of_storage;
_Vector_impl() _Vector_impl()
: _Tp_alloc_type(), _M_start(0), _M_finish(0), _M_end_of_storage(0) : _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: public:
_Vector_impl _M_impl; _Vector_impl _M_impl;
_Tp* typename _Tp_alloc_type::pointer
_M_allocate(size_t __n) _M_allocate(size_t __n)
{ return __n != 0 ? _M_impl.allocate(__n) : 0; } { return __n != 0 ? _M_impl.allocate(__n) : 0; }
void void
_M_deallocate(_Tp* __p, size_t __n) _M_deallocate(typename _Tp_alloc_type::pointer __p, size_t __n)
{ {
if (__p) if (__p)
_M_impl.deallocate(__p, __n); _M_impl.deallocate(__p, __n);