diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2002-12-16 18:23:00 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2002-12-16 18:23:00 +0000 |
| commit | 4977bab6ed59f01c73f9c8b9e92298706df9b6d5 (patch) | |
| tree | c259697c448b0c6f548f153c48c46a8d7a75970f /libstdc++-v3/src/codecvt.cc | |
| parent | b51dc045004ee7eb8d2bf4358ddf22a6cc6c1d00 (diff) | |
| download | gcc-4977bab6ed59f01c73f9c8b9e92298706df9b6d5.tar.gz | |
Merge basic-improvements-branch to trunk
From-SVN: r60174
Diffstat (limited to 'libstdc++-v3/src/codecvt.cc')
| -rw-r--r-- | libstdc++-v3/src/codecvt.cc | 8 |
1 files changed, 4 insertions, 4 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>:: |