commit 05051da560e684d59ae132e6de7d25144289bda0
author Howard Hinnant <hhinnant@apple.com> Mon Feb 14 19:12:38 2011 +0000
committer Howard Hinnant <hhinnant@apple.com> Mon Feb 14 19:12:38 2011 +0000
tree 79e19aef724979610fcb85d827c620ce7649233d
parent dfcdc89957c0bb3c0e45f3d1d6c2d7b9596a7fea

Chris Jefferson noted many places where function calls needed to be qualified (thanks Chris).

llvm-svn: 125510
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: a0fe8c436e8286dca0deb390b75a683a86206e94

src/strstream.cpp

diff --git a/src/strstream.cpp b/src/strstream.cpp
index d0a0ab0..ef12f98 100644
--- a/src/strstream.cpp
+++ b/src/strstream.cpp
@@ -302,7 +302,7 @@
         {
             char* newpos = eback() + newoff;
             if (pos_in)
-                setg(eback(), newpos, max(newpos, egptr()));
+                setg(eback(), newpos, _STD::max(newpos, egptr()));
             if (pos_out)
             {
                 // min(pbase, newpos), newpos, epptr()
@@ -332,7 +332,7 @@
             {
                 char* newpos = eback() + newoff;
                 if (pos_in)
-                    setg(eback(), newpos, max(newpos, egptr()));
+                    setg(eback(), newpos, _STD::max(newpos, egptr()));
                 if (pos_out)
                 {
                     // min(pbase, newpos), newpos, epptr()