Ignore:
Timestamp:
Jul 11, 2015, 5:16:37 PM (4 years ago)
Author:
nmedfort
Message:

Minor changes to function compilation preceeding any modification of the pablo Call class.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/do_grep.cpp

    r4538 r4659  
    131131void GrepExecutor::doGrep(const std::string infilename) {
    132132
    133     struct Basis_bits basis_bits;
    134     struct Output output;
     133    Basis_bits basis_bits;
    135134    BitBlock match_vector;
    136135    BitBlock process_block_state_data[(mProcessBlockStateSize + sizeof(BitBlock) - 1)/sizeof(BitBlock)];   
     
    196195            block_base = blk*BLOCK_SIZE + segment_base;
    197196            s2p_do_block((BytePack *) &mFileBuffer[block_base], basis_bits);
     197            Output output;
    198198            mProcessBlockFcn(basis_bits, process_block_state_data, output);
    199199
     200            mMatch_scanner.load_block(output.matches, blk);
    200201            mLineBreak_scanner.load_block(output.LF, blk);
    201             mMatch_scanner.load_block(output.matches, blk);
     202
    202203            if (mCountOnlyOption){
    203204                if (bitblock::any(output.matches))
     
    241242        block_base = block_pos + segment_base;
    242243        s2p_do_block((BytePack *) &mFileBuffer[block_base], basis_bits);
     244        Output output;
    243245        mProcessBlockFcn(basis_bits, process_block_state_data, output);
    244246
     
    284286    }
    285287   
     288    Output output;
    286289    mProcessBlockFcn(basis_bits, process_block_state_data, output);
    287290
Note: See TracChangeset for help on using the changeset viewer.