bitset (bitset::_M_is_any): Don't use __BITSET_WORDS macro on _Nw since _Nw is alread...

	* stl/bitset (bitset::_M_is_any): Don't use __BITSET_WORDS macro
	on _Nw since _Nw is already the number of words in the bitset.

From-SVN: r35885

diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index d4b7cc78caec9ca20467e12f82671629c28c4192..6e97abde70b8d20aa1eb61a74f357562f89bfe38 100644 (file)
--- a/libstdc++/stl/ChangeLog
+++ b/libstdc++/stl/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-22  Geoff Berry  <geoffb@bops.com>
+
+       * bitset (bitset::_M_is_any): Don't use __BITSET_WORDS macro
+       on _Nw since _Nw is already the number of words in the bitset.
+
 2000-07-10  Martin v. Löwis (loewis@informatik.hu-berlin.de)
 
        * stl_function.h (bind1st, bind2nd): Rename __opr to __oper, 

diff --git a/libstdc++/stl/bitset b/libstdc++/stl/bitset
index 8b4f8b1a0f806f642d9466ca708057026b280892..3b702ab1f4c0be766b96989259c153acb5956a07 100644 (file)
--- a/libstdc++/stl/bitset
+++ b/libstdc++/stl/bitset
@@ -144,7 +144,7 @@ struct _Base_bitset {
   }
 
   bool _M_is_any() const {
-    for ( size_t __i = 0; __i < __BITSET_WORDS(_Nw,_WordT); __i++ ) {
+    for ( size_t __i = 0; __i < _Nw; __i++ ) {
       if ( _M_w[__i] != static_cast<_WordT>(0) )
         return true;
     }