Merge basic-improvements-branch to trunk

[thirdparty/gcc.git] / libstdc++-v3 / include / bits / fstream.tcc

diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index 387f099ae983d0c7319a412a4edc7f651ac1f6fc..e4bc382a74c8339712375eda6c41095fcd3f7c76 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;