diff options
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/codecvt.cc | 8 | ||||
| -rw-r--r-- | libstdc++-v3/src/strstream.cc | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libstdc++-v3/src/codecvt.cc b/libstdc++-v3/src/codecvt.cc index b9575cf70bc..e86d15b9397 100644 --- a/libstdc++-v3/src/codecvt.cc +++ b/libstdc++-v3/src/codecvt.cc @@ -64,7 +64,7 @@ namespace std extern_type* __to, extern_type* __to_end, extern_type*& __to_next) const { - size_t __len = min(__from_end - __from, __to_end - __to); + size_t __len = std::min(__from_end - __from, __to_end - __to); memcpy(__to, __from, __len); __from_next = __from; __to_next = __to; @@ -87,7 +87,7 @@ namespace std intern_type* __to, intern_type* __to_end, intern_type*& __to_next) const { - size_t __len = min(__from_end - __from, __to_end - __to); + size_t __len = std::min(__from_end - __from, __to_end - __to); memcpy(__to, __from, __len); __from_next = __from; __to_next = __to; @@ -108,7 +108,7 @@ namespace std codecvt<char, char, mbstate_t>:: do_length (const state_type&, const extern_type* __from, const extern_type* __end, size_t __max) const - { return min(__max, static_cast<size_t>(__end - __from)); } + { return std::min(__max, static_cast<size_t>(__end - __from)); } int codecvt<char, char, mbstate_t>:: @@ -154,7 +154,7 @@ namespace std codecvt<wchar_t, char, mbstate_t>:: do_length(const state_type&, const extern_type* __from, const extern_type* __end, size_t __max) const - { return min(__max, static_cast<size_t>(__end - __from)); } + { return std::min(__max, static_cast<size_t>(__end - __from)); } int codecvt<wchar_t, char, mbstate_t>:: diff --git a/libstdc++-v3/src/strstream.cc b/libstdc++-v3/src/strstream.cc index 4d585659b9b..f0c1000e6d4 100644 --- a/libstdc++-v3/src/strstream.cc +++ b/libstdc++-v3/src/strstream.cc @@ -59,7 +59,7 @@ namespace std : _Base(), _M_alloc_fun(0), _M_free_fun(0), _M_dynamic(true), _M_frozen(false), _M_constant(false) { - streamsize n = max(initial_capacity, streamsize(16)); + streamsize n = std::max(initial_capacity, streamsize(16)); char* buf = _M_alloc(n); if (buf) @@ -148,7 +148,7 @@ namespace std if (pptr() == epptr() && _M_dynamic && !_M_frozen && !_M_constant) { ptrdiff_t old_size = epptr() - pbase(); - ptrdiff_t new_size = max(2 * old_size, ptrdiff_t(1)); + ptrdiff_t new_size = std::max(2 * old_size, ptrdiff_t(1)); char* buf = _M_alloc(new_size); if (buf) @@ -168,7 +168,7 @@ namespace std if (reposition_get) setg(buf, buf + old_get_offset, buf + - max(old_get_offset, old_size)); + std::max(old_get_offset, old_size)); _M_free(old_buffer); } |