Merge basic-improvements-branch to trunk

[thirdparty/gcc.git] / libstdc++-v3 / config / locale / gnu / codecvt_members.cc

diff --git a/libstdc++-v3/config/locale/gnu/codecvt_members.cc b/libstdc++-v3/config/locale/gnu/codecvt_members.cc
index aa855a6a1f285c6ba00828015765849f002c4ef5..5140dd200d0afd6f6e3b3a30a041cdb37820cdf4 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/codecvt_members.cc
+++ b/libstdc++-v3/config/locale/gnu/codecvt_members.cc
@@ -48,7 +48,7 @@ namespace std
         extern_type*& __to_next) const
   {
     result __ret = error;
-    size_t __len = min(__from_end - __from, __to_end - __to);
+    size_t __len = std::min(__from_end - __from, __to_end - __to);
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
     __c_locale __old = __uselocale(_M_c_locale_codecvt);
 #endif
@@ -83,7 +83,7 @@ namespace std
        intern_type*& __to_next) const
   {
     result __ret = error;
-    size_t __len = min(__from_end - __from, __to_end - __to);
+    size_t __len = std::min(__from_end - __from, __to_end - __to);
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
     __c_locale __old = __uselocale(_M_c_locale_codecvt);
 #endif