diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-02-14 19:12:38 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-02-14 19:12:38 +0000 |
| commit | 6cf5d8c3aaab7aeaedac2a89085790b9f92d1a4c (patch) | |
| tree | 79e19aef724979610fcb85d827c620ce7649233d /include/locale | |
| parent | c4cbb5b6b7626e4a8b74e0f61a4c5a88591f36a0 (diff) | |
Chris Jefferson noted many places where function calls needed to be qualified (thanks Chris).
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@125510 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/locale')
| -rw-r--r-- | include/locale | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/locale b/include/locale index b88c6ac3e..72039a59d 100644 --- a/include/locale +++ b/include/locale @@ -2580,7 +2580,7 @@ time_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob, 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 @@ __money_put<_CharT>::__format(char_type* __mb, char_type*& __mi, char_type*& __m 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 @@ __money_put<_CharT>::__format(char_type* __mb, char_type*& __mi, char_type*& __m } // 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 @@ wbuffer_convert<_Codecvt, _Elem, _Tr>::underflow() 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_; |