* configure.ac: Set ABI_TWEAKS_SRCDIR.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / src / strstream.cc

diff --git a/libstdc++-v3/src/strstream.cc b/libstdc++-v3/src/strstream.cc
index 4d58565..832a19c 100644 (file)
--- a/libstdc++-v3/src/strstream.cc
+++ b/libstdc++-v3/src/strstream.cc
@@ -1,6 +1,6 @@
 // strstream definitions -*- C++ -*-
 
-// Copyright (C) 2001, 2002 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -59,7 +59,7 @@ namespace std
   : _Base(), _M_alloc_fun(0), _M_free_fun(0), _M_dynamic(true), 
     _M_frozen(false), _M_constant(false)
   {
-    streamsize n = max(initial_capacity, streamsize(16));
+    streamsize n = std::max(initial_capacity, streamsize(16));
     
     char* buf = _M_alloc(n);
     if (buf) 
@@ -148,7 +148,7 @@ namespace std
     if (pptr() == epptr() && _M_dynamic && !_M_frozen && !_M_constant) 
       {
        ptrdiff_t old_size = epptr() - pbase();
-       ptrdiff_t new_size = max(2 * old_size, ptrdiff_t(1));
+       ptrdiff_t new_size = std::max(ptrdiff_t(2 * old_size), ptrdiff_t(1));
        
        char* buf = _M_alloc(new_size);
        if (buf) 
@@ -168,7 +168,7 @@ namespace std
 
            if (reposition_get)
              setg(buf, buf + old_get_offset, buf + 
-                  max(old_get_offset, old_size));
+                  std::max(old_get_offset, old_size));
 
            _M_free(old_buffer);
          }
@@ -194,7 +194,7 @@ namespace std
          gbump(-1);
          return _Traits::not_eof(c);
        }
-      else if (c == static_cast<int_type>(gptr()[-1])) 
+      else if (c == _Traits::to_int_type(gptr()[-1])) 
        {  // KLUDGE
          gbump(-1);
          return c;