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 /src | |
| parent | c4cbb5b6b7626e4a8b74e0f61a4c5a88591f36a0 (diff) | |
| download | libcxx-6cf5d8c3aaab7aeaedac2a89085790b9f92d1a4c.tar.gz | |
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 'src')
| -rw-r--r-- | src/ios.cpp | 6 | ||||
| -rw-r--r-- | src/regex.cpp | 4 | ||||
| -rw-r--r-- | src/strstream.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/ios.cpp b/src/ios.cpp index f506e12ab..e7153cba2 100644 --- a/src/ios.cpp +++ b/src/ios.cpp @@ -165,7 +165,7 @@ ios_base::iword(int index) 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 @@ ios_base::pword(int index) 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 @@ ios_base::register_callback(event_callback fn, int index) 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)); diff --git a/src/regex.cpp b/src/regex.cpp index 9bc66a5f3..a29ed7336 100644 --- a/src/regex.cpp +++ b/src/regex.cpp @@ -229,7 +229,7 @@ string __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 @@ ctype_base::mask __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) { diff --git a/src/strstream.cpp b/src/strstream.cpp index d0a0ab027..ef12f982f 100644 --- a/src/strstream.cpp +++ b/src/strstream.cpp @@ -302,7 +302,7 @@ strstreambuf::seekoff(off_type __off, ios_base::seekdir __way, ios_base::openmod { 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 @@ strstreambuf::seekpos(pos_type __sp, ios_base::openmode __which) { 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() |