diff options
Diffstat (limited to 'libstdc++-v3/include/bits/stl_bvector.h')
| -rw-r--r-- | libstdc++-v3/include/bits/stl_bvector.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 2c97d470582..da72b6460ab 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -410,7 +410,7 @@ template <typename _Alloc> template <class _ForwardIterator> void _M_initialize_range(_ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { - size_type __n = distance(__first, __last); + size_type __n = std::distance(__first, __last); _M_initialize(__n); copy(__first, __last, _M_start); } @@ -430,14 +430,14 @@ template <typename _Alloc> _ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { if (__first != __last) { - size_type __n = distance(__first, __last); + size_type __n = std::distance(__first, __last); if (capacity() - size() >= __n) { copy_backward(__position, end(), _M_finish + difference_type(__n)); copy(__first, __last, __position); _M_finish += difference_type(__n); } else { - size_type __len = size() + max(size(), __n); + size_type __len = size() + std::max(size(), __n); _Bit_type * __q = _M_bit_alloc(__len); iterator __i = copy(begin(), __position, iterator(__q, 0)); __i = copy(__first, __last, __i); @@ -592,7 +592,7 @@ template <typename _Alloc> template <class _ForwardIterator> void _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last, forward_iterator_tag) { - size_type __len = distance(__first, __last); + size_type __len = std::distance(__first, __last); if (__len < size()) erase(copy(__first, __last, begin()), end()); else { @@ -677,7 +677,7 @@ template <typename _Alloc> _M_finish += difference_type(__n); } else { - size_type __len = size() + max(size(), __n); + size_type __len = size() + std::max(size(), __n); _Bit_type * __q = _M_bit_alloc(__len); iterator __i = copy(begin(), __position, iterator(__q, 0)); fill_n(__i, __n, __x); |