OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

istream.tcc (getline): Make sure arguments passed to min/max have the same type. 

* include/bits/istream.tcc (getline): Make sure arguments passed
to min/max have the same type.
* include/bits/locale_facets.tcc (__verify_grouping): Likewise.
* include/bits/stl_deque.h (_Deque_base::_Deque_base): Likewise.

From-SVN: r83522
This commit is contained in:
Alexandre Oliva 2004-06-22 22:22:14 +00:00 committed by Alexandre Oliva
parent 514df03fda
commit fa94878458
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2004-06-22 Alexandre Oliva <aoliva@redhat.com>
* include/bits/istream.tcc (getline): Make sure arguments passed
to min/max have the same type.
* include/bits/locale_facets.tcc (__verify_grouping): Likewise.
* include/bits/stl_deque.h (_Deque_base::_Deque_base): Likewise.
2004-06-22 Benjamin Kosnik <bkoz@redhat.com>
* docs/html/abi.html: Update links.

3
libstdc++-v3/include/bits/istream.tcc
View File

@ -598,7 +598,8 @@ namespace std
{
streamsize __size = std::min(streamsize(__sb->egptr()
- __sb->gptr()),
__n - _M_gcount - 1);
streamsize(__n - _M_gcount
- 1));
if (__size > 1)
{
const char_type* __p = traits_type::find(__sb->gptr(),

2
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -2448,7 +2448,7 @@ namespace std
const string& __grouping_tmp)
{
const size_t __n = __grouping_tmp.size() - 1;
const size_t __min = std::min(__n, __grouping_size - 1);
const size_t __min = std::min(__n, size_t(__grouping_size - 1));
size_t __i = __n;
bool __test = true;

2
libstdc++-v3/include/bits/stl_deque.h
View File

@ -446,7 +446,7 @@ namespace _GLIBCXX_STD
size_t __num_nodes = __num_elements / __deque_buf_size(sizeof(_Tp)) + 1;
this->_M_impl._M_map_size = std::max((size_t) _S_initial_map_size,
__num_nodes + 2);
size_t(__num_nodes + 2));
this->_M_impl._M_map = _M_allocate_map(this->_M_impl._M_map_size);
// For "small" maps (needing less than _M_map_size nodes), allocation