aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2001-05-31 19:10:23 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2001-05-31 19:10:23 +0000
commitd29087b4311840a5834218400e8870a16b93b488 (patch)
tree26b0e1114ede14fa5d600a99ee1ae8c546f8353c
parent9b337833223c3a09a66ec8651279f331d25006ea (diff)
downloadgcc-d29087b4311840a5834218400e8870a16b93b488.zip
gcc-d29087b4311840a5834218400e8870a16b93b488.tar.gz
gcc-d29087b4311840a5834218400e8870a16b93b488.tar.bz2
bitset.cc: Qualify size_t with std::.
2001-05-31 Benjamin Kosnik <bkoz@redhat.com> libstdc++/2997 * src/bitset.cc: Qualify size_t with std::. From-SVN: r42751
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/src/bitset.cc14
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 <bkoz@redat.com>
+2001-05-31 Benjamin Kosnik <bkoz@redhat.com>
+
+ libstdc++/2997
+ * src/bitset.cc: Qualify size_t with std::.
+
+2001-05-30 Benjamin Kosnik <bkoz@redhat.com>
* 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<unsigned char>(__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<unsigned char>(__thisword & (~(unsigned char)0));
if ( __this_byte )
@@ -194,4 +195,3 @@ template unsigned char std::_Bit_count<true>::_S_bit_count[];
template unsigned char std::_First_one<false>::_S_first_one[];
template unsigned char std::_First_one<true>::_S_first_one[];
-