[cfe-commits] [libcxx] r125510 - in /libcxx/trunk: include/__std_stream include/algorithm include/deque include/forward_list include/fstream include/istream include/iterator include/list include/locale include/map include/regex include/sstream include/vector src/ios.cpp src/regex.cpp src/strstream.cpp
Howard Hinnant
hhinnant at apple.com
Mon Feb 14 11:12:38 PST 2011
Author: hhinnant
Date: Mon Feb 14 13:12:38 2011
New Revision: 125510
URL: http://llvm.org/viewvc/llvm-project?rev=125510&view=rev
Log:
Chris Jefferson noted many places where function calls needed to be qualified (thanks Chris).
Modified:
libcxx/trunk/include/__std_stream
libcxx/trunk/include/algorithm
libcxx/trunk/include/deque
libcxx/trunk/include/forward_list
libcxx/trunk/include/fstream
libcxx/trunk/include/istream
libcxx/trunk/include/iterator
libcxx/trunk/include/list
libcxx/trunk/include/locale
libcxx/trunk/include/map
libcxx/trunk/include/regex
libcxx/trunk/include/sstream
libcxx/trunk/include/vector
libcxx/trunk/src/ios.cpp
libcxx/trunk/src/regex.cpp
libcxx/trunk/src/strstream.cpp
Modified: libcxx/trunk/include/__std_stream
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__std_stream?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/__std_stream (original)
+++ libcxx/trunk/include/__std_stream Mon Feb 14 13:12:38 2011
@@ -97,7 +97,7 @@
__stdinbuf<_CharT>::__getchar(bool __consume)
{
char __extbuf[__limit];
- int __nread = max(1, __encoding_);
+ int __nread = _STD::max(1, __encoding_);
for (int __i = 0; __i < __nread; ++__i)
{
char __c = getc(__file_);
Modified: libcxx/trunk/include/algorithm
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/algorithm?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/algorithm (original)
+++ libcxx/trunk/include/algorithm Mon Feb 14 13:12:38 2011
@@ -1573,7 +1573,7 @@
>::type
copy_n(_InputIterator __first, _Size __n, _OutputIterator __result)
{
- return copy(__first, __first + __n, __result);
+ return _STD::copy(__first, __first + __n, __result);
}
// move
Modified: libcxx/trunk/include/deque
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/deque?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/deque (original)
+++ libcxx/trunk/include/deque Mon Feb 14 13:12:38 2011
@@ -603,7 +603,7 @@
typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
while (__f != __l)
{
- __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = prev(__r);
+ __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = _STD::prev(__r);
pointer __rb = *__rp.__m_iter_;
pointer __re = __rp.__ptr_ + 1;
difference_type __bs = __re - __rb;
@@ -776,7 +776,7 @@
typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
while (__f != __l)
{
- __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = prev(__r);
+ __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = _STD::prev(__r);
pointer __rb = *__rp.__m_iter_;
pointer __re = __rp.__ptr_ + 1;
difference_type __bs = __re - __rb;
@@ -1780,7 +1780,7 @@
{
const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
iterator __b = __base::begin();
- iterator __bm1 = prev(__b);
+ iterator __bm1 = _STD::prev(__b);
if (__vt == pointer_traits<const_pointer>::pointer_to(*__b))
__vt = pointer_traits<const_pointer>::pointer_to(*__bm1);
__alloc_traits::construct(__a, _STD::addressof(*__bm1), _STD::move(*__b));
@@ -1806,7 +1806,7 @@
{
const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
iterator __e = __base::end();
- iterator __em1 = prev(__e);
+ iterator __em1 = _STD::prev(__e);
if (__vt == pointer_traits<const_pointer>::pointer_to(*__em1))
__vt = pointer_traits<const_pointer>::pointer_to(*__e);
__alloc_traits::construct(__a, _STD::addressof(*__e), _STD::move(*__em1));
@@ -1842,7 +1842,7 @@
else
{
iterator __b = __base::begin();
- iterator __bm1 = prev(__b);
+ iterator __bm1 = _STD::prev(__b);
__alloc_traits::construct(__a, _STD::addressof(*__bm1), _STD::move(*__b));
--__base::__start_;
++__base::size();
@@ -1865,7 +1865,7 @@
else
{
iterator __e = __base::end();
- iterator __em1 = prev(__e);
+ iterator __em1 = _STD::prev(__e);
__alloc_traits::construct(__a, _STD::addressof(*__e), _STD::move(*__em1));
++__base::size();
if (__de > 1)
@@ -1900,7 +1900,7 @@
else
{
iterator __b = __base::begin();
- iterator __bm1 = prev(__b);
+ iterator __bm1 = _STD::prev(__b);
__alloc_traits::construct(__a, _STD::addressof(*__bm1), _STD::move(*__b));
--__base::__start_;
++__base::size();
@@ -1923,7 +1923,7 @@
else
{
iterator __e = __base::end();
- iterator __em1 = prev(__e);
+ iterator __em1 = _STD::prev(__e);
__alloc_traits::construct(__a, _STD::addressof(*__e), _STD::move(*__em1));
++__base::size();
if (__de > 1)
@@ -2209,7 +2209,7 @@
size_type __nb = __recommend_blocks(__n + __base::__map_.empty());
// Number of unused blocks at back:
size_type __back_capacity = __back_spare() / __base::__block_size;
- __back_capacity = min(__back_capacity, __nb); // don't take more than you need
+ __back_capacity = _STD::min(__back_capacity, __nb); // don't take more than you need
__nb -= __back_capacity; // number of blocks need to allocate
// If __nb == 0, then we have sufficient capacity.
if (__nb == 0)
@@ -2354,7 +2354,7 @@
size_type __nb = __recommend_blocks(__n + __base::__map_.empty());
// Number of unused blocks at front:
size_type __front_capacity = __front_spare() / __base::__block_size;
- __front_capacity = min(__front_capacity, __nb); // don't take more than you need
+ __front_capacity = _STD::min(__front_capacity, __nb); // don't take more than you need
__nb -= __front_capacity; // number of blocks need to allocate
// If __nb == 0, then we have sufficient capacity.
if (__nb == 0)
@@ -2608,7 +2608,7 @@
allocator_type& __a = __base::__alloc();
if (__pos < (__base::size() - 1) / 2)
{ // erase from front
- _STD::move_backward(__b, __p, next(__p));
+ _STD::move_backward(__b, __p, _STD::next(__p));
__alloc_traits::destroy(__a, _STD::addressof(*__b));
--__base::size();
++__base::__start_;
Modified: libcxx/trunk/include/forward_list
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/forward_list?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/forward_list (original)
+++ libcxx/trunk/include/forward_list Mon Feb 14 13:12:38 2011
@@ -871,7 +871,7 @@
forward_list<_Tp, _Alloc>::assign(_InputIterator __f, _InputIterator __l)
{
iterator __i = before_begin();
- iterator __j = next(__i);
+ iterator __j = _STD::next(__i);
iterator __e = end();
for (; __j != __e && __f != __l; ++__i, ++__j, ++__f)
*__j = *__f;
@@ -886,7 +886,7 @@
forward_list<_Tp, _Alloc>::assign(size_type __n, const value_type& __v)
{
iterator __i = before_begin();
- iterator __j = next(__i);
+ iterator __j = _STD::next(__i);
iterator __e = end();
for (; __j != __e && __n > 0; --__n, ++__i, ++__j)
*__j = __v;
@@ -1235,7 +1235,7 @@
forward_list& __x,
const_iterator __i)
{
- const_iterator __lm1 = next(__i);
+ const_iterator __lm1 = _STD::next(__i);
if (__p != __i && __p != __lm1)
{
const_cast<__node_pointer>(__i.__ptr_)->__next_ =
@@ -1312,7 +1312,7 @@
{
if (__i.__ptr_->__next_->__value_ == __v)
{
- iterator __j = next(__i, 2);
+ iterator __j = _STD::next(__i, 2);
for (; __j != __e && *__j == __v; ++__j)
;
erase_after(__i, __j);
@@ -1335,7 +1335,7 @@
{
if (__pred(__i.__ptr_->__next_->__value_))
{
- iterator __j = next(__i, 2);
+ iterator __j = _STD::next(__i, 2);
for (; __j != __e && __pred(*__j); ++__j)
;
erase_after(__i, __j);
@@ -1355,7 +1355,7 @@
{
for (iterator __i = begin(), __e = end(); __i != __e;)
{
- iterator __j = next(__i);
+ iterator __j = _STD::next(__i);
for (; __j != __e && __binary_pred(*__i, *__j); ++__j)
;
if (__i.__ptr_->__next_ != __j.__ptr_)
@@ -1456,7 +1456,7 @@
}
difference_type __sz1 = __sz / 2;
difference_type __sz2 = __sz - __sz1;
- __node_pointer __t = next(iterator(__f1), __sz1 - 1).__ptr_;
+ __node_pointer __t = _STD::next(iterator(__f1), __sz1 - 1).__ptr_;
__node_pointer __f2 = __t->__next_;
__t->__next_ = nullptr;
return __merge(__sort(__f1, __sz1, __comp),
Modified: libcxx/trunk/include/fstream
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/fstream?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/fstream (original)
+++ libcxx/trunk/include/fstream Mon Feb 14 13:12:38 2011
@@ -587,7 +587,7 @@
memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
__extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
__extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
- size_t __nmemb = min(static_cast<size_t>(this->egptr() - this->eback() - __unget_sz),
+ size_t __nmemb = _STD::min(static_cast<size_t>(this->egptr() - this->eback() - __unget_sz),
static_cast<size_t>(__extbufend_ - __extbufnext_));
codecvt_base::result __r;
state_type __svs = __st_;
Modified: libcxx/trunk/include/istream
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/istream?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/istream (original)
+++ libcxx/trunk/include/istream Mon Feb 14 13:12:38 2011
@@ -1265,7 +1265,7 @@
case 0:
break;
default:
- __c = min(__c, __n);
+ __c = _STD::min(__c, __n);
for (streamsize __k = 0; __k < __c; ++__k, ++__s, ++__i)
*__s = *__i;
}
Modified: libcxx/trunk/include/iterator
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/iterator?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/iterator (original)
+++ libcxx/trunk/include/iterator Mon Feb 14 13:12:38 2011
@@ -488,7 +488,7 @@
typename iterator_traits<_ForwardIter>::difference_type __n = 1,
typename enable_if<__is_forward_iterator<_ForwardIter>::value>::type* = 0)
{
- advance(__x, __n);
+ _STD::advance(__x, __n);
return __x;
}
@@ -499,7 +499,7 @@
typename iterator_traits<_BidiretionalIter>::difference_type __n = 1,
typename enable_if<__is_bidirectional_iterator<_BidiretionalIter>::value>::type* = 0)
{
- advance(__x, -__n);
+ _STD::advance(__x, -__n);
return __x;
}
Modified: libcxx/trunk/include/list
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/list?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/list (original)
+++ libcxx/trunk/include/list Mon Feb 14 13:12:38 2011
@@ -714,8 +714,8 @@
typename list<_Tp, _Alloc>::iterator
list<_Tp, _Alloc>::__iterator(size_type __n)
{
- return __n <= base::__sz() / 2 ? next(begin(), __n)
- : prev(end(), base::__sz() - __n);
+ return __n <= base::__sz() / 2 ? _STD::next(begin(), __n)
+ : _STD::prev(end(), base::__sz() - __n);
}
template <class _Tp, class _Alloc>
@@ -1321,7 +1321,7 @@
void
list<_Tp, _Alloc>::splice(const_iterator __p, list& __c, const_iterator __i)
{
- if (__p != __i && __p != next(__i))
+ if (__p != __i && __p != _STD::next(__i))
{
__node& __f = const_cast<__node&>(*__i.__ptr_);
base::__unlink_nodes(__f, __f);
@@ -1359,7 +1359,7 @@
{
if (*__i == __x)
{
- iterator __j = next(__i);
+ iterator __j = _STD::next(__i);
for (; __j != __e && *__j == __x; ++__j)
;
__i = erase(__i, __j);
@@ -1378,7 +1378,7 @@
{
if (__pred(*__i))
{
- iterator __j = next(__i);
+ iterator __j = _STD::next(__i);
for (; __j != __e && __pred(*__j); ++__j)
;
__i = erase(__i, __j);
@@ -1403,7 +1403,7 @@
{
for (iterator __i = begin(), __e = end(); __i != __e;)
{
- iterator __j = next(__i);
+ iterator __j = _STD::next(__i);
for (; __j != __e && __binary_pred(*__i, *__j); ++__j)
;
if (++__i != __j)
@@ -1435,7 +1435,7 @@
if (__comp(*__f2, *__f1))
{
size_type __ds = 1;
- iterator __m2 = next(__f2);
+ iterator __m2 = _STD::next(__f2);
for (; __m2 != __e2 && __comp(*__m2, *__f1); ++__m2, ++__ds)
;
base::__sz() += __ds;
@@ -1444,7 +1444,7 @@
__node& __l = *__m2.__ptr_->__prev_;
__f2 = __m2;
base::__unlink_nodes(__f, __l);
- __m2 = next(__f1);
+ __m2 = _STD::next(__f1);
__link_nodes(*__f1.__ptr_, __f, __l);
__f1 = __m2;
}
@@ -1493,12 +1493,12 @@
return __f1;
}
size_type __n2 = __n / 2;
- iterator __e1 = next(__f1, __n2);
+ iterator __e1 = _STD::next(__f1, __n2);
iterator __r = __f1 = __sort(__f1, __e1, __n2, __comp);
iterator __f2 = __e1 = __sort(__e1, __e2, __n - __n2, __comp);
if (__comp(*__f2, *__f1))
{
- iterator __m2 = next(__f2);
+ iterator __m2 = _STD::next(__f2);
for (; __m2 != __e2 && __comp(*__m2, *__f1); ++__m2)
;
__node& __f = *__f2.__ptr_;
@@ -1506,7 +1506,7 @@
__r = __f2;
__e1 = __f2 = __m2;
base::__unlink_nodes(__f, __l);
- __m2 = next(__f1);
+ __m2 = _STD::next(__f1);
__link_nodes(*__f1.__ptr_, __f, __l);
__f1 = __m2;
}
@@ -1516,7 +1516,7 @@
{
if (__comp(*__f2, *__f1))
{
- iterator __m2 = next(__f2);
+ iterator __m2 = _STD::next(__f2);
for (; __m2 != __e2 && __comp(*__m2, *__f1); ++__m2)
;
__node& __f = *__f2.__ptr_;
@@ -1525,7 +1525,7 @@
__e1 = __m2;
__f2 = __m2;
base::__unlink_nodes(__f, __l);
- __m2 = next(__f1);
+ __m2 = _STD::next(__f1);
__link_nodes(*__f1.__ptr_, __f, __l);
__f1 = __m2;
}
Modified: libcxx/trunk/include/locale
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/locale?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/locale (original)
+++ libcxx/trunk/include/locale Mon Feb 14 13:12:38 2011
@@ -2580,7 +2580,7 @@
char_type* __nb = __nar;
char_type* __ne = __nb + 100;
__do_put(__nb, __ne, __tm, __fmt, __mod);
- return copy(__nb, __ne, __s);
+ return _STD::copy(__nb, __ne, __s);
}
extern template class time_put<char>;
@@ -3248,7 +3248,7 @@
break;
case money_base::symbol:
if (!__sym.empty() && (__flags & ios_base::showbase))
- __me = copy(__sym.begin(), __sym.end(), __me);
+ __me = _STD::copy(__sym.begin(), __sym.end(), __me);
break;
case money_base::value:
{
@@ -3307,7 +3307,7 @@
}
// print rest of sign, if any
if (__sn.size() > 1)
- __me = copy(__sn.begin()+1, __sn.end(), __me);
+ __me = _STD::copy(__sn.begin()+1, __sn.end(), __me);
// set alignment
if ((__flags & ios_base::adjustfield) == ios_base::left)
__mi = __me;
@@ -3967,7 +3967,7 @@
memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
__extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
__extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
- streamsize __nmemb = min(static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz),
+ streamsize __nmemb = _STD::min(static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz),
static_cast<streamsize>(__extbufend_ - __extbufnext_));
codecvt_base::result __r;
state_type __svs = __st_;
Modified: libcxx/trunk/include/map
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/map?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/map (original)
+++ libcxx/trunk/include/map Mon Feb 14 13:12:38 2011
@@ -1042,7 +1042,7 @@
else if (__tree_.value_comp().key_comp()(__hint->first, __k)) // check after
{
// *__hint < __k
- const_iterator __next = next(__hint);
+ const_iterator __next = _STD::next(__hint);
if (__next == end() || __tree_.value_comp().key_comp()(__k, __next->first))
{
// *__hint < __k < *next(__hint)
Modified: libcxx/trunk/include/regex
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/regex?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/regex (original)
+++ libcxx/trunk/include/regex Mon Feb 14 13:12:38 2011
@@ -2228,7 +2228,7 @@
++__consumed;
if (__might_have_digraph_)
{
- const _CharT* __next = next(__s.__current_);
+ const _CharT* __next = _STD::next(__s.__current_);
if (__next != __s.__last_)
{
pair<_CharT, _CharT> __ch2(*__s.__current_, *__next);
@@ -2919,7 +2919,7 @@
__first = __parse_RE_expression(__first, __last);
if (__first != __last)
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
if (__temp == __last && *__first == '$')
{
__push_r_anchor();
@@ -3148,7 +3148,7 @@
{
if (__first != __last)
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
if (__temp != __last)
{
if (*__first == '\\' && *__temp == '(')
@@ -3166,7 +3166,7 @@
{
if (__first != __last)
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
if (__temp != __last)
{
if (*__first == '\\' && *__temp == ')')
@@ -3184,7 +3184,7 @@
{
if (__first != __last)
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
if (__temp != __last)
{
if (*__first == '\\' && *__temp == '{')
@@ -3202,7 +3202,7 @@
{
if (__first != __last)
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
if (__temp != __last)
{
if (*__first == '\\' && *__temp == '}')
@@ -3220,7 +3220,7 @@
{
if (__first != __last)
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
if (__temp != __last)
{
if (*__first == '\\' && '1' <= *__temp && *__temp <= '9')
@@ -3241,7 +3241,7 @@
{
if (__first != __last)
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
if (__temp == __last && *__first == '$')
return __first;
// Not called inside a bracket
@@ -3299,7 +3299,7 @@
{
if (__first != __last)
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
if (__temp != __last)
{
if (*__first == '\\')
@@ -3330,7 +3330,7 @@
{
if (__first != __last)
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
if (__temp != __last)
{
if (*__first == '\\')
@@ -3640,7 +3640,7 @@
{
if (__first != __last && *__first != ']')
{
- _ForwardIterator __temp = next(__first);
+ _ForwardIterator __temp = _STD::next(__first);
basic_string<_CharT> __start_range;
if (__temp != __last && *__first == '[')
{
@@ -3669,7 +3669,7 @@
}
if (__first != __last && *__first != ']')
{
- __temp = next(__first);
+ __temp = _STD::next(__first);
if (__temp != __last && *__first == '-' && *__temp != ']')
{
// parse a range
@@ -3891,7 +3891,7 @@
#endif // _LIBCPP_NO_EXCEPTIONS
}
}
- __first = next(__temp, 2);
+ __first = _STD::next(__temp, 2);
return __first;
}
@@ -3920,7 +3920,7 @@
throw regex_error(regex_constants::error_brack);
#endif // _LIBCPP_NO_EXCEPTIONS
__ml->__add_class(__class_type);
- __first = next(__temp, 2);
+ __first = _STD::next(__temp, 2);
return __first;
}
@@ -3953,7 +3953,7 @@
throw regex_error(regex_constants::error_collate);
#endif // _LIBCPP_NO_EXCEPTIONS
}
- __first = next(__temp, 2);
+ __first = _STD::next(__temp, 2);
return __first;
}
@@ -5220,18 +5220,18 @@
__matches_.resize(__m.size());
for (size_type __i = 0; __i < __matches_.size(); ++__i)
{
- __matches_[__i].first = next(__f, _STD::distance(__mf, __m[__i].first));
- __matches_[__i].second = next(__f, _STD::distance(__mf, __m[__i].second));
+ __matches_[__i].first = _STD::next(__f, _STD::distance(__mf, __m[__i].first));
+ __matches_[__i].second = _STD::next(__f, _STD::distance(__mf, __m[__i].second));
__matches_[__i].matched = __m[__i].matched;
}
__unmatched_.first = __l;
__unmatched_.second = __l;
__unmatched_.matched = false;
- __prefix_.first = next(__f, _STD::distance(__mf, __m.prefix().first));
- __prefix_.second = next(__f, _STD::distance(__mf, __m.prefix().second));
+ __prefix_.first = _STD::next(__f, _STD::distance(__mf, __m.prefix().first));
+ __prefix_.second = _STD::next(__f, _STD::distance(__mf, __m.prefix().second));
__prefix_.matched = __m.prefix().matched;
- __suffix_.first = next(__f, _STD::distance(__mf, __m.suffix().first));
- __suffix_.second = next(__f, _STD::distance(__mf, __m.suffix().second));
+ __suffix_.first = _STD::next(__f, _STD::distance(__mf, __m.suffix().first));
+ __suffix_.second = _STD::next(__f, _STD::distance(__mf, __m.suffix().second));
__suffix_.matched = __m.suffix().matched;
if (!__no_update_pos)
__position_start_ = __prefix_.first;
Modified: libcxx/trunk/include/sstream
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/sstream?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/sstream (original)
+++ libcxx/trunk/include/sstream Mon Feb 14 13:12:38 2011
@@ -451,7 +451,7 @@
}
#endif // _LIBCPP_NO_EXCEPTIONS
}
- __hm_ = max(this->pptr() + 1, __hm_);
+ __hm_ = _STD::max(this->pptr() + 1, __hm_);
if (__mode_ & ios_base::in)
{
char_type* __p = const_cast<char_type*>(__str_.data());
Modified: libcxx/trunk/include/vector
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/vector?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/include/vector (original)
+++ libcxx/trunk/include/vector Mon Feb 14 13:12:38 2011
@@ -1101,7 +1101,7 @@
if (__n <= capacity())
{
size_type __s = size();
- _STD::fill_n(this->__begin_, min(__n, __s), __u);
+ _STD::fill_n(this->__begin_, _STD::min(__n, __s), __u);
if (__n > __s)
__construct_at_end(__n - __s, __u);
else
Modified: libcxx/trunk/src/ios.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/ios.cpp?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/src/ios.cpp (original)
+++ libcxx/trunk/src/ios.cpp Mon Feb 14 13:12:38 2011
@@ -165,7 +165,7 @@
size_t newcap;
const size_t mx = std::numeric_limits<size_t>::max();
if (req_size < mx/2)
- newcap = max(2 * __iarray_cap_, req_size);
+ newcap = _STD::max(2 * __iarray_cap_, req_size);
else
newcap = mx;
long* iarray = (long*)realloc(__iarray_, newcap * sizeof(long));
@@ -193,7 +193,7 @@
size_t newcap;
const size_t mx = std::numeric_limits<size_t>::max();
if (req_size < mx/2)
- newcap = max(2 * __parray_cap_, req_size);
+ newcap = _STD::max(2 * __parray_cap_, req_size);
else
newcap = mx;
void** parray = (void**)realloc(__parray_, newcap * sizeof(void*));
@@ -223,7 +223,7 @@
size_t newcap;
const size_t mx = std::numeric_limits<size_t>::max();
if (req_size < mx/2)
- newcap = max(2 * __event_cap_, req_size);
+ newcap = _STD::max(2 * __event_cap_, req_size);
else
newcap = mx;
event_callback* fns = (event_callback*)realloc(__fn_, newcap * sizeof(event_callback));
Modified: libcxx/trunk/src/regex.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/regex.cpp?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/src/regex.cpp (original)
+++ libcxx/trunk/src/regex.cpp Mon Feb 14 13:12:38 2011
@@ -229,7 +229,7 @@
__get_collation_name(const char* s)
{
const collationnames* i =
- lower_bound(begin(collatenames), end(collatenames), s, use_strcmp());
+ _STD::lower_bound(begin(collatenames), end(collatenames), s, use_strcmp());
string r;
if (i != end(collatenames) && strcmp(s, i->elem_) == 0)
r = char(i->char_);
@@ -240,7 +240,7 @@
__get_classname(const char* s, bool __icase)
{
const classnames* i =
- lower_bound(begin(ClassNames), end(ClassNames), s, use_strcmp());
+ _STD::lower_bound(begin(ClassNames), end(ClassNames), s, use_strcmp());
ctype_base::mask r = 0;
if (i != end(ClassNames) && strcmp(s, i->elem_) == 0)
{
Modified: libcxx/trunk/src/strstream.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/strstream.cpp?rev=125510&r1=125509&r2=125510&view=diff
==============================================================================
--- libcxx/trunk/src/strstream.cpp (original)
+++ libcxx/trunk/src/strstream.cpp Mon Feb 14 13:12:38 2011
@@ -302,7 +302,7 @@
{
char* newpos = eback() + newoff;
if (pos_in)
- setg(eback(), newpos, max(newpos, egptr()));
+ setg(eback(), newpos, _STD::max(newpos, egptr()));
if (pos_out)
{
// min(pbase, newpos), newpos, epptr()
@@ -332,7 +332,7 @@
{
char* newpos = eback() + newoff;
if (pos_in)
- setg(eback(), newpos, max(newpos, egptr()));
+ setg(eback(), newpos, _STD::max(newpos, egptr()));
if (pos_out)
{
// min(pbase, newpos), newpos, epptr()
More information about the cfe-commits
mailing list