Changeset 1610


Ignore:
Timestamp:
Oct 29, 2011, 12:57:21 AM (7 years ago)
Author:
ksherdy
Message:

Update BitBlockIterator?.hpp header.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/pablo_template.cpp

    r1608 r1610  
    1111#include "../lib/carryQ.hpp"
    1212#include "../lib/bit_stream_iterator.hpp"
    13 #include "../lib/bit_block_iterator.hpp"
     13#include "../lib/bitblock_iterator.hpp"
    1414
    1515#define SEGMENT_BLOCKS 12
     
    7272void do_process(FILE *infile, FILE *outfile);
    7373
    74 static inline void validate_block(BitBlockIterator<BitBlock> & start, int block_base, int is_valid(int));
    75 static inline void validate_block(BitBlockIterator<BitBlock> & start, int block_base, int is_valid(int,int));
     74static inline void validate_block(BitBlockForwardIterator & start, int block_base, int is_valid(int));
     75static inline void validate_block(BitBlockForwardIterator & start, int block_base, int is_valid(int,int));
    7676
    7777int main(int argc, char * argv[]) {
     
    267267}
    268268
    269 static inline void validate_block(BitBlockIterator<BitBlock> & start, int block_base, int is_valid(int)) {
    270 
    271         BitBlockIterator<BitBlock> end;
     269static inline void validate_block(BitBlockForwardIterator & start, int block_base, int is_valid(int)) {
     270
     271        BitBlockForwardIterator end;
    272272        int pos, block_pos;
    273273
     
    287287}
    288288
    289 static inline void validate_block(BitBlockIterator<BitBlock> & start, int block_base, int buffer_base, int is_valid(int,int)) {
    290 
    291         BitBlockIterator<BitBlock> end;
     289static inline void validate_block(BitBlockForwardIterator & start, int block_base, int buffer_base, int is_valid(int,int)) {
     290
     291        BitBlockForwardIterator end;
    292292        int pos, block_pos, file_pos;
    293293
     
    314314
    315315                if (bitblock_has_bit(simd_or(check_streams.non_ascii_name_starts, check_streams.non_ascii_names))) {
    316                     BitBlockIterator<BitBlock> iter_NameStrt_check(&check_streams.non_ascii_name_starts);
     316                    BitBlockForwardIterator iter_NameStrt_check(&check_streams.non_ascii_name_starts);
    317317                        validate_block(iter_NameStrt_check, block_base, NameStrt_check);
    318                         BitBlockIterator<BitBlock> iter_Name_check(&check_streams.non_ascii_names);
     318                        BitBlockForwardIterator iter_Name_check(&check_streams.non_ascii_names);
    319319                        validate_block(iter_Name_check, block_base, Name_check);
    320320                }
    321321            if (bitblock_has_bit(ctCDPI_Callouts.PI_name_starts)){
    322                 BitBlockIterator<BitBlock> iter_PI_name_starts(&(ctCDPI_Callouts.PI_name_starts));
     322                BitBlockForwardIterator iter_PI_name_starts(&(ctCDPI_Callouts.PI_name_starts));
    323323                validate_block(iter_PI_name_starts, block_base, buffer_base, PIName_check);
    324324            }
    325325            if (bitblock_has_bit(ctCDPI_Callouts.CD_starts)){
    326                 BitBlockIterator<BitBlock> iter_CD_check(&ctCDPI_Callouts.CD_starts);
     326                BitBlockForwardIterator iter_CD_check(&ctCDPI_Callouts.CD_starts);
    327327                validate_block(iter_CD_check, block_base, CD_check);
    328328            }
    329329            if(bitblock_has_bit(ref_Callouts.GenRef_starts)){
    330                 BitBlockIterator<BitBlock> iter_GenRef_check(&ref_Callouts.GenRef_starts);
     330                BitBlockForwardIterator iter_GenRef_check(&ref_Callouts.GenRef_starts);
    331331                validate_block(iter_GenRef_check, block_base, GenRef_check);
    332332            }
    333333            if(bitblock_has_bit(ref_Callouts.DecRef_starts)){
    334                 BitBlockIterator<BitBlock> iter_DecRef_check(&ref_Callouts.DecRef_starts);
     334                BitBlockForwardIterator iter_DecRef_check(&ref_Callouts.DecRef_starts);
    335335                validate_block(iter_DecRef_check, block_base, DecRef_check);
    336336            }
    337337            if(bitblock_has_bit(ref_Callouts.HexRef_starts)){
    338                 BitBlockIterator<BitBlock> iter_HexRef_check(&ref_Callouts.HexRef_starts);
     338                BitBlockForwardIterator iter_HexRef_check(&ref_Callouts.HexRef_starts);
    339339                validate_block(iter_HexRef_check, block_base, HexRef_check);
    340340            }
    341341            if(bitblock_has_bit(check_streams.att_refs)){
    342                 BitBlockIterator<BitBlock> iter_AttRef_check(&check_streams.att_refs);
     342                BitBlockForwardIterator iter_AttRef_check(&check_streams.att_refs);
    343343                validate_block(iter_AttRef_check, block_base, AttRef_check);
    344344            }
Note: See TracChangeset for help on using the changeset viewer.