aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/bits/stl_bvector.h
diff options
context:
space:
mode:
Diffstat (limited to 'libstdc++-v3/include/bits/stl_bvector.h')
-rw-r--r--libstdc++-v3/include/bits/stl_bvector.h86
1 files changed, 45 insertions, 41 deletions
diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index 66c7e2de594..ce6df71b67f 100644
--- a/libstdc++-v3/include/bits/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
@@ -63,17 +63,19 @@
namespace std
{
- extern const int __WORD_BIT;
+ typedef unsigned long _Bit_type;
+ enum { _M_word_bit = int(CHAR_BIT * sizeof(_Bit_type)) };
struct _Bit_reference {
- unsigned int* _M_p;
- unsigned int _M_mask;
- _Bit_reference(unsigned int* __x, unsigned int __y)
+
+ _Bit_type * _M_p;
+ _Bit_type _M_mask;
+ _Bit_reference(_Bit_type * __x, _Bit_type __y)
: _M_p(__x), _M_mask(__y) {}
public:
_Bit_reference() : _M_p(0), _M_mask(0) {}
- operator bool() const { return !(!(*_M_p & _M_mask)); }
+ operator bool() const { return !!(*_M_p & _M_mask); }
_Bit_reference& operator=(bool __x)
{
if (__x) *_M_p |= _M_mask;
@@ -84,9 +86,8 @@ public:
{ return *this = bool(__x); }
bool operator==(const _Bit_reference& __x) const
{ return bool(*this) == bool(__x); }
- bool operator<(const _Bit_reference& __x) const {
- return !bool(*this) && bool(__x);
- }
+ bool operator<(const _Bit_reference& __x) const
+ { return !bool(*this) && bool(__x); }
void flip() { *_M_p ^= _M_mask; }
};
@@ -99,31 +100,31 @@ inline void swap(_Bit_reference __x, _Bit_reference __y)
struct _Bit_iterator_base : public iterator<random_access_iterator_tag, bool>
{
- unsigned int* _M_p;
+ _Bit_type * _M_p;
unsigned int _M_offset;
- _Bit_iterator_base(unsigned int* __x, unsigned int __y)
+ _Bit_iterator_base(_Bit_type * __x, unsigned int __y)
: _M_p(__x), _M_offset(__y) {}
void _M_bump_up() {
- if (_M_offset++ == __WORD_BIT - 1) {
+ if (_M_offset++ == _M_word_bit - 1) {
_M_offset = 0;
++_M_p;
}
}
void _M_bump_down() {
if (_M_offset-- == 0) {
- _M_offset = __WORD_BIT - 1;
+ _M_offset = _M_word_bit - 1;
--_M_p;
}
}
void _M_incr(ptrdiff_t __i) {
difference_type __n = __i + _M_offset;
- _M_p += __n / __WORD_BIT;
- __n = __n % __WORD_BIT;
+ _M_p += __n / _M_word_bit;
+ __n = __n % _M_word_bit;
if (__n < 0) {
- _M_offset = (unsigned int) __n + __WORD_BIT;
+ _M_offset = (unsigned int) __n + _M_word_bit;
--_M_p;
} else
_M_offset = (unsigned int) __n;
@@ -151,7 +152,7 @@ struct _Bit_iterator_base : public iterator<random_access_iterator_tag, bool>
inline ptrdiff_t
operator-(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y) {
- return __WORD_BIT * (__x._M_p - __y._M_p) + __x._M_offset - __y._M_offset;
+ return _M_word_bit * (__x._M_p - __y._M_p) + __x._M_offset - __y._M_offset;
}
@@ -162,10 +163,10 @@ struct _Bit_iterator : public _Bit_iterator_base
typedef _Bit_iterator iterator;
_Bit_iterator() : _Bit_iterator_base(0, 0) {}
- _Bit_iterator(unsigned int* __x, unsigned int __y)
+ _Bit_iterator(_Bit_type * __x, unsigned int __y)
: _Bit_iterator_base(__x, __y) {}
- reference operator*() const { return reference(_M_p, 1U << _M_offset); }
+ reference operator*() const { return reference(_M_p, 1UL << _M_offset); }
iterator& operator++() {
_M_bump_up();
return *this;
@@ -216,13 +217,13 @@ struct _Bit_const_iterator : public _Bit_iterator_base
typedef _Bit_const_iterator const_iterator;
_Bit_const_iterator() : _Bit_iterator_base(0, 0) {}
- _Bit_const_iterator(unsigned int* __x, unsigned int __y)
+ _Bit_const_iterator(_Bit_type * __x, unsigned int __y)
: _Bit_iterator_base(__x, __y) {}
_Bit_const_iterator(const _Bit_iterator& __x)
: _Bit_iterator_base(__x._M_p, __x._M_offset) {}
const_reference operator*() const {
- return _Bit_reference(_M_p, 1U << _M_offset);
+ return _Bit_reference(_M_p, 1UL << _M_offset);
}
const_iterator& operator++() {
_M_bump_up();
@@ -282,19 +283,19 @@ public:
: _M_data_allocator(__a), _M_start(), _M_finish(), _M_end_of_storage(0) {}
protected:
- unsigned int* _M_bit_alloc(size_t __n)
- { return _M_data_allocator.allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
+ _Bit_type * _M_bit_alloc(size_t __n)
+ { return _M_data_allocator.allocate((__n + _M_word_bit - 1)/_M_word_bit); }
void _M_deallocate() {
if (_M_start._M_p)
_M_data_allocator.deallocate(_M_start._M_p,
_M_end_of_storage - _M_start._M_p);
}
- typename _Alloc_traits<unsigned int, _Allocator>::allocator_type
+ typename _Alloc_traits<_Bit_type, _Allocator>::allocator_type
_M_data_allocator;
_Bit_iterator _M_start;
_Bit_iterator _M_finish;
- unsigned int* _M_end_of_storage;
+ _Bit_type * _M_end_of_storage;
};
// Specialization for instanceless allocators.
@@ -309,11 +310,11 @@ public:
: _M_start(), _M_finish(), _M_end_of_storage(0) {}
protected:
- typedef typename _Alloc_traits<unsigned int, _Allocator>::_Alloc_type
+ typedef typename _Alloc_traits<_Bit_type, _Allocator>::_Alloc_type
_Alloc_type;
- unsigned int* _M_bit_alloc(size_t __n)
- { return _Alloc_type::allocate((__n + __WORD_BIT - 1)/__WORD_BIT); }
+ _Bit_type * _M_bit_alloc(size_t __n)
+ { return _Alloc_type::allocate((__n + _M_word_bit - 1)/_M_word_bit); }
void _M_deallocate() {
if (_M_start._M_p)
_Alloc_type::deallocate(_M_start._M_p,
@@ -322,7 +323,7 @@ protected:
_Bit_iterator _M_start;
_Bit_iterator _M_finish;
- unsigned int* _M_end_of_storage;
+ _Bit_type * _M_end_of_storage;
};
template <class _Alloc>
@@ -379,8 +380,8 @@ template <typename _Alloc>
protected:
void _M_initialize(size_type __n) {
- unsigned int* __q = _M_bit_alloc(__n);
- _M_end_of_storage = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
+ _Bit_type * __q = _M_bit_alloc(__n);
+ _M_end_of_storage = __q + (__n + _M_word_bit - 1)/_M_word_bit;
_M_start = iterator(__q, 0);
_M_finish = _M_start + difference_type(__n);
}
@@ -391,13 +392,14 @@ template <typename _Alloc>
++_M_finish;
}
else {
- size_type __len = size() ? 2 * size() : __WORD_BIT;
- unsigned int* __q = _M_bit_alloc(__len);
+ size_type __len = size()
+ ? 2 * size() : static_cast<size_type>(_M_word_bit);
+ _Bit_type * __q = _M_bit_alloc(__len);
iterator __i = copy(begin(), __position, iterator(__q, 0));
*__i++ = __x;
_M_finish = copy(__position, end(), __i);
_M_deallocate();
- _M_end_of_storage = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
+ _M_end_of_storage = __q + (__len + _M_word_bit - 1)/_M_word_bit;
_M_start = iterator(__q, 0);
}
}
@@ -443,12 +445,12 @@ template <typename _Alloc>
}
else {
size_type __len = size() + max(size(), __n);
- unsigned int* __q = _M_bit_alloc(__len);
+ _Bit_type * __q = _M_bit_alloc(__len);
iterator __i = copy(begin(), __position, iterator(__q, 0));
__i = copy(__first, __last, __i);
_M_finish = copy(__position, end(), __i);
_M_deallocate();
- _M_end_of_storage = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
+ _M_end_of_storage = __q + (__len + _M_word_bit - 1)/_M_word_bit;
_M_start = iterator(__q, 0);
}
}
@@ -609,12 +611,14 @@ template <typename _Alloc>
}
void reserve(size_type __n) {
- if (capacity() < __n) {
- unsigned int* __q = _M_bit_alloc(__n);
+ if (__n > this->max_size())
+ __throw_length_error("vector::reserve");
+ if (this->capacity() < __n) {
+ _Bit_type * __q = _M_bit_alloc(__n);
_M_finish = copy(begin(), end(), iterator(__q, 0));
_M_deallocate();
_M_start = iterator(__q, 0);
- _M_end_of_storage = __q + (__n + __WORD_BIT - 1)/__WORD_BIT;
+ _M_end_of_storage = __q + (__n + _M_word_bit - 1)/_M_word_bit;
}
}
@@ -673,12 +677,12 @@ template <typename _Alloc>
}
else {
size_type __len = size() + max(size(), __n);
- unsigned int* __q = _M_bit_alloc(__len);
+ _Bit_type * __q = _M_bit_alloc(__len);
iterator __i = copy(begin(), __position, iterator(__q, 0));
fill_n(__i, __n, __x);
_M_finish = copy(__position, end(), __i + difference_type(__n));
_M_deallocate();
- _M_end_of_storage = __q + (__len + __WORD_BIT - 1)/__WORD_BIT;
+ _M_end_of_storage = __q + (__len + _M_word_bit - 1)/_M_word_bit;
_M_start = iterator(__q, 0);
}
}
@@ -705,7 +709,7 @@ template <typename _Alloc>
insert(end(), __new_size - size(), __x);
}
void flip() {
- for (unsigned int* __p = _M_start._M_p; __p != _M_end_of_storage; ++__p)
+ for (_Bit_type * __p = _M_start._M_p; __p != _M_end_of_storage; ++__p)
*__p = ~*__p;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 07:03:55 +0000