OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge basic-improvements-branch to trunk
[pf3gnuchains/gcc-fork.git]
/
libstdc++-v3
/
include
/
bits
/
fstream.tcc
diff --git
a/libstdc++-v3/include/bits/fstream.tcc
b/libstdc++-v3/include/bits/fstream.tcc
index
387f099
..
e4bc382
100644
(file)
--- a/
libstdc++-v3/include/bits/fstream.tcc
+++ b/
libstdc++-v3/include/bits/fstream.tcc
@@
-439,7
+439,7
@@
namespace std
else
{
__ret = _M_file.seekoff(__off, ios_base::cur, __mode);
- __ret += max(_M_out_cur, _M_in_cur) - _M_filepos;
+ __ret +=
std::
max(_M_out_cur, _M_in_cur) - _M_filepos;
}
}
_M_last_overflowed = false;