diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-04-29 16:20:26 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-04-29 16:20:26 +0000 |
| commit | 6c38001ec593343c3b7ba370acbbc302bce05a09 (patch) | |
| tree | c9d17f602595892c8913707dc1e701cf742314ca | |
| parent | 0e50682f265352687d679dee46283928750a2747 (diff) | |
| download | bcm5719-llvm-6c38001ec593343c3b7ba370acbbc302bce05a09.tar.gz bcm5719-llvm-6c38001ec593343c3b7ba370acbbc302bce05a09.zip | |
Qualify calls to std::next(), to avoid conflicts with
libraries/applications that define their own 'next' template.
llvm-svn: 130511
| -rw-r--r-- | libcxx/include/__tree | 2 | ||||
| -rw-r--r-- | libcxx/include/deque | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/include/__tree b/libcxx/include/__tree index fddcd4a01cd..edba15a3389 100644 --- a/libcxx/include/__tree +++ b/libcxx/include/__tree @@ -1609,7 +1609,7 @@ __tree<_Tp, _Compare, _Allocator>::__find_equal(const_iterator __hint, const_iterator __next = _STD::next(__hint); if (__next == end() || value_comp()(__v, *__next)) { - // *__hint < __v < *next(__hint) + // *__hint < __v < *_STD::next(__hint) if (__hint.__ptr_->__right_ == nullptr) { __parent = const_cast<__node_pointer&>(__hint.__ptr_); diff --git a/libcxx/include/deque b/libcxx/include/deque index cb1d147e8be..369e9b8115d 100644 --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -1787,7 +1787,7 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, const value_type& __v) --__base::__start_; ++__base::size(); if (__pos > 1) - __b = __move_and_check(next(__b), __b + __pos, __b, __vt); + __b = __move_and_check(_STD::next(__b), __b + __pos, __b, __vt); *__b = *__vt; } } @@ -1847,7 +1847,7 @@ deque<_Tp, _Allocator>::insert(const_iterator __p, value_type&& __v) --__base::__start_; ++__base::size(); if (__pos > 1) - __b = _STD::move(next(__b), __b + __pos, __b); + __b = _STD::move(_STD::next(__b), __b + __pos, __b); *__b = _STD::move(__v); } } @@ -1905,7 +1905,7 @@ deque<_Tp, _Allocator>::emplace(const_iterator __p, _Args&&... __args) --__base::__start_; ++__base::size(); if (__pos > 1) - __b = _STD::move(next(__b), __b + __pos, __b); + __b = _STD::move(_STD::next(__b), __b + __pos, __b); *__b = value_type(_STD::forward<_Args>(__args)...); } } @@ -2621,7 +2621,7 @@ deque<_Tp, _Allocator>::erase(const_iterator __f) } else { // erase from back - iterator __i = _STD::move(next(__p), __base::end(), __p); + iterator __i = _STD::move(_STD::next(__p), __base::end(), __p); __alloc_traits::destroy(__a, _STD::addressof(*__i)); --__base::size(); if (__back_spare() >= 2 * __base::__block_size) |
