mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-22 00:59:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

sstream.tcc (overflow): Make sure operands of min and max have the same type.

Browse Source 
* include/bits/sstream.tcc (overflow): Make sure operands of min
and max have the same type.

From-SVN: r65368
This commit is contained in:
Alexandre Oliva 2003-04-08 12:03:26 +00:00 committed by Alexandre Oliva
parent 799b33a028
commit e9fcab6251
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2003-04-08 Alexandre Oliva <aoliva@redhat.com>
* include/bits/sstream.tcc (overflow): Make sure operands of min
and max have the same type.
2003-04-04 Jerry Quinn <jlquinn@optonline.net>
PR libstdc++/10276

4
libstdc++-v3/include/bits/sstream.tcc
View File

@ -1,6 +1,6 @@
// String based streams -*- C++ -*-
// Copyright (C) 1997, 1998, 1999, 2001, 2002
// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -90,7 +90,7 @@ namespace std
// In virtue of DR 169 (TC) we are allowed to grow more than
// one char the first time and also...
__size_type __len =
std::max(_M_string.capacity() + 1, this->_M_buf_size_opt);
std::max(__size_type(_M_string.capacity() + 1), this->_M_buf_size_opt);
bool __testwrite = this->_M_out_cur < this->_M_out_end;
if (__builtin_expect(!__testwrite && __len > _M_string.max_size(), false))