Merge basic-improvements-branch to trunk

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / bits / streambuf.tcc

diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc
index a2e0b4b..73db2cd 100644 (file)
--- a/libstdc++-v3/include/bits/streambuf.tcc
+++ b/libstdc++-v3/include/bits/streambuf.tcc
@@ -69,7 +69,7 @@ namespace std
       bool __testpos = _M_in_cur && _M_in_beg < _M_in_cur;
       bool __testne = _M_in_cur && !traits_type::eq(__c, this->gptr()[-1]);
       if (!__testpos || __testne)
-       __ret = pbackfail(traits_type::to_int_type(__c));
+       __ret = this->pbackfail(traits_type::to_int_type(__c));
       else 
        {
          _M_in_cur_move(-1);
@@ -128,7 +128,7 @@ namespace std
          if (__buf_len > 0)
            {
              size_t __remaining = __n - __ret;
-             size_t __len = min(__buf_len, __remaining);
+             size_t __len = std::min(__buf_len, __remaining);
              traits_type::copy(__s, _M_in_cur, __len);
              __ret += __len;
              __s += __len;
@@ -167,7 +167,7 @@ namespace std
          if (__buf_len > 0)
            {
              off_type __remaining = __n - __ret;
-             off_type __len = min(__buf_len, __remaining);
+             off_type __len = std::min(__buf_len, __remaining);
              traits_type::copy(_M_out_cur, __s, __len);
              __ret += __len;
              __s += __len;