From 8cc0cc58762f4098b56d627c35cde1eb5d1569cd Mon Sep 17 00:00:00 2001 From: bkoz Date: Thu, 31 May 2001 19:10:23 +0000 Subject: [PATCH] 2001-05-31 Benjamin Kosnik libstdc++/2997 * src/bitset.cc: Qualify size_t with std::. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42751 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 7 ++++++- libstdc++-v3/src/bitset.cc | 14 +++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 041ba92..1359361 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,9 @@ -2001-05-30 Benjamin Kosnik +2001-05-31 Benjamin Kosnik + + libstdc++/2997 + * src/bitset.cc: Qualify size_t with std::. + +2001-05-30 Benjamin Kosnik * acconfig.h (_GLIBCPP_BUGGY_FLOAT_COMPLEX): Remove. (_GLIBCPP_BUGGY_COMPLEX): Remove. diff --git a/libstdc++-v3/src/bitset.cc b/libstdc++-v3/src/bitset.cc index 599a399..110d242 100644 --- a/libstdc++-v3/src/bitset.cc +++ b/libstdc++-v3/src/bitset.cc @@ -18,14 +18,14 @@ // _Base_bitset. // -size_t -std::_Base_bitset<1>::_M_do_find_first(size_t __not_found) const +std::size_t +std::_Base_bitset<1>::_M_do_find_first(std::size_t __not_found) const { _WordT __thisword = _M_w; if ( __thisword != static_cast<_WordT>(0) ) { // find byte within word - for ( size_t __j = 0; __j < sizeof(_WordT); __j++ ) { + for (std::size_t __j = 0; __j < sizeof(_WordT); __j++ ) { unsigned char __this_byte = static_cast(__thisword & (~(unsigned char)0)); if ( __this_byte ) @@ -38,8 +38,9 @@ std::_Base_bitset<1>::_M_do_find_first(size_t __not_found) const return __not_found; } -size_t -std::_Base_bitset<1>::_M_do_find_next(size_t __prev, size_t __not_found) const +std::size_t +std::_Base_bitset<1>::_M_do_find_next(std::size_t __prev, + std::size_t __not_found) const { // make bound inclusive ++__prev; @@ -58,7 +59,7 @@ std::_Base_bitset<1>::_M_do_find_next(size_t __prev, size_t __not_found) const // find byte within word // get first byte into place __thisword >>= _S_whichbyte(__prev) * CHAR_BIT; - for ( size_t __j = _S_whichbyte(__prev); __j < sizeof(_WordT); __j++ ) { + for ( std::size_t __j = _S_whichbyte(__prev); __j < sizeof(_WordT); __j++ ) { unsigned char __this_byte = static_cast(__thisword & (~(unsigned char)0)); if ( __this_byte ) @@ -194,4 +195,3 @@ template unsigned char std::_Bit_count::_S_bit_count[]; template unsigned char std::_First_one::_S_first_one[]; template unsigned char std::_First_one::_S_first_one[]; - -- 2.7.4