diff options
author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-14 02:52:05 +0000 |
---|---|---|
committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-14 02:52:05 +0000 |
commit | 979a04507d13ef056c1d11a2979bbf42ebc5f3c3 (patch) | |
tree | 94f2f4de4e06e819e5d44c00159d978e3bc98aae /libstdc++-v3/include/bits/stl_bvector.h | |
parent | dde836b51f72f58a1bf8aed4ebf7730cffe39a5c (diff) | |
download | ppe42-gcc-979a04507d13ef056c1d11a2979bbf42ebc5f3c3.tar.gz ppe42-gcc-979a04507d13ef056c1d11a2979bbf42ebc5f3c3.zip |
* config/locale/generic/c_locale.h: Include <cstdlib> and
<cstring>.
* include/bits/boost_concept_check.h: Add this-> to unqualified
method calls.
* include/bits/deque.tcc: Likewise.
* include/bits/locale_facets.h : Likewise.
* include/bits/ostream.tcc: Likewise.
* include/bits/stl_algo.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
* include/bits/stl_deque.h: Likewise.
* include/bits/stl_list.h: Likewise.
* include/bits/stl_tree.h: Likewise.
* include/bits/stl_vector.h: Likewise.
* include/bits/vector.tcc: Likewise.
* include/ext/rope: Likewise.
* include/ext/ropeimpl.h: Likewise.
* include/ext/stdio_filebuf.h: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69315 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/stl_bvector.h')
-rw-r--r-- | libstdc++-v3/include/bits/stl_bvector.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 755e581a005..15e0f57f166 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -373,7 +373,7 @@ template <typename _Alloc> protected: void _M_initialize(size_type __n) { - _Bit_type * __q = _M_bit_alloc(__n); + _Bit_type * __q = this->_M_bit_alloc(__n); this->_M_end_of_storage = __q + (__n + _S_word_bit - 1)/_S_word_bit; this->_M_start = iterator(__q, 0); this->_M_finish = this->_M_start + difference_type(__n); @@ -387,11 +387,11 @@ template <typename _Alloc> else { size_type __len = size() ? 2 * size() : static_cast<size_type>(_S_word_bit); - _Bit_type * __q = _M_bit_alloc(__len); + _Bit_type * __q = this->_M_bit_alloc(__len); iterator __i = std::copy(begin(), __position, iterator(__q, 0)); *__i++ = __x; this->_M_finish = std::copy(__position, end(), __i); - _M_deallocate(); + this->_M_deallocate(); this->_M_end_of_storage = __q + (__len + _S_word_bit - 1)/_S_word_bit; this->_M_start = iterator(__q, 0); } @@ -439,11 +439,11 @@ template <typename _Alloc> } else { size_type __len = size() + std::max(size(), __n); - _Bit_type * __q = _M_bit_alloc(__len); + _Bit_type * __q = this->_M_bit_alloc(__len); iterator __i = std::copy(begin(), __position, iterator(__q, 0)); __i = std::copy(__first, __last, __i); this->_M_finish = std::copy(__position, end(), __i); - _M_deallocate(); + this->_M_deallocate(); this->_M_end_of_storage = __q + (__len + _S_word_bit - 1)/_S_word_bit; this->_M_start = iterator(__q, 0); @@ -539,7 +539,7 @@ template <typename _Alloc> vector& operator=(const vector& __x) { if (&__x == this) return *this; if (__x.size() > capacity()) { - _M_deallocate(); + this->_M_deallocate(); _M_initialize(__x.size()); } std::copy(__x.begin(), __x.end(), begin()); @@ -609,9 +609,9 @@ template <typename _Alloc> if (__n > this->max_size()) __throw_length_error(__N("vector::reserve")); if (this->capacity() < __n) { - _Bit_type * __q = _M_bit_alloc(__n); + _Bit_type * __q = this->_M_bit_alloc(__n); this->_M_finish = std::copy(begin(), end(), iterator(__q, 0)); - _M_deallocate(); + this->_M_deallocate(); this->_M_start = iterator(__q, 0); this->_M_end_of_storage = __q + (__n + _S_word_bit - 1)/_S_word_bit; } @@ -682,11 +682,11 @@ template <typename _Alloc> } else { size_type __len = size() + std::max(size(), __n); - _Bit_type * __q = _M_bit_alloc(__len); + _Bit_type * __q = this->_M_bit_alloc(__len); iterator __i = std::copy(begin(), __position, iterator(__q, 0)); std::fill_n(__i, __n, __x); this->_M_finish = std::copy(__position, end(), __i + difference_type(__n)); - _M_deallocate(); + this->_M_deallocate(); this->_M_end_of_storage = __q + (__len + _S_word_bit - 1)/_S_word_bit; this->_M_start = iterator(__q, 0); } |