diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-03-04 21:21:44 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2003-03-04 21:21:44 +0000 |
| commit | 1a8f10da2ce369173baecfda58cb74862a8dd6dd (patch) | |
| tree | c3aaad807a936f27fecc4b2ee33fcdace0f8599b /libstdc++-v3/src | |
| parent | ec4a0419ad5374ad56137458e8de8bc4047cebe3 (diff) | |
| download | gcc-1a8f10da2ce369173baecfda58cb74862a8dd6dd.tar.gz gcc-1a8f10da2ce369173baecfda58cb74862a8dd6dd.tar.bz2 gcc-1a8f10da2ce369173baecfda58cb74862a8dd6dd.zip | |
strstream.cc (strstreambuf::overflow): Make sure operands of min and max have the same type.
* src/strstream.cc (strstreambuf::overflow): Make sure operands of
min and max have the same type.
* include/bits/basic_string.tcc (append, rfind, compare): Likewise.
From-SVN: r63802
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/strstream.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/src/strstream.cc b/libstdc++-v3/src/strstream.cc index f0c1000e6d4..a030697f68d 100644 --- 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 @@ -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 = std::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) |