Changeset 3140 for trunk


Ignore:
Timestamp:
May 14, 2013, 4:38:07 PM (6 years ago)
Author:
cameron
Message:

Add BitBlockForwardScanner?; replace incorrect '=' with '=='

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/bitblock_iterator.hpp

    r3131 r3140  
    140140};
    141141
     142class BitBlockForwardScanner: public ForwardScanner<BitBlock, ScanWord> {
     143public:
     144        BitBlockForwardScanner(){}
     145        BitBlockForwardScanner(BitBlock * s): ForwardScanner<BitBlock, ScanWord>(s){}
     146};
     147
    142148
    143149template <class bitblock_t, class scanblock_t>
     
    279285        bool operator==(const ReverseIterator& iter)
    280286        {
    281                 return ((scanner.get_strm() = iter.scanner.get_strm()) && (scanner.get_pos() == iter.scanner.get_pos));
     287                return ((scanner.get_strm() == iter.scanner.get_strm()) && (scanner.get_pos() == iter.scanner.get_pos));
    282288        }
    283289
     
    357363        bool operator==(const BitStreamIterator& iter)
    358364        {
    359                 return((strm = iter.strm) && (pos == iter.pos));
     365                return((strm == iter.strm) && (pos == iter.pos));
    360366        }
    361367
     
    521527        {
    522528                return (scanner.get_strm() == iter.scanner.get_strm()) &&
    523                        (scanner.get_pos() == iter.scanner.get_pos()) /*&&
    524                        (eq_bitblocks<bitblock_t>(scanner.base_per_field16, iter.scanner.base_per_field16))*/;
     529                       (scanner.get_pos() == iter.scanner.get_pos) &&
     530                       (eq_bitblocks<bitblock_t>(scanner.base_per_field16, iter.scanner.base_per_field16));
    525531        }
    526532
     
    529535        {
    530536                return (scanner.get_strm() != iter.scanner.get_strm()) ||
    531                        (scanner.get_pos() != iter.scanner.get_pos()) /*||
    532                        (!eq_bitblocks<bitblock_t>(scanner.base_per_field16, iter.scanner.base_per_field16))*/;
     537                       (scanner.get_pos() != iter.scanner.get_pos) ||
     538                       (!eq_bitblocks<bitblock_t>(scanner.base_per_field16, iter.scanner.base_per_field16));
    533539        }
    534540
Note: See TracChangeset for help on using the changeset viewer.