diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-16 18:23:00 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-16 18:23:00 +0000 |
| commit | 805e22b2051e9c6a75377ea6599654d7415da483 (patch) | |
| tree | c259697c448b0c6f548f153c48c46a8d7a75970f /libstdc++-v3/include/bits/streambuf.tcc | |
| parent | 2c27ce73ee2229b0871c4ccad2342d8a4be85eff (diff) | |
| download | gcc-805e22b2051e9c6a75377ea6599654d7415da483.tar.gz | |
Merge basic-improvements-branch to trunk
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60174 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/streambuf.tcc')
| -rw-r--r-- | libstdc++-v3/include/bits/streambuf.tcc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc index 5f57df583a7..73db2cdebfd 100644 --- a/libstdc++-v3/include/bits/streambuf.tcc +++ b/libstdc++-v3/include/bits/streambuf.tcc @@ -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; |