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.h

    r4538 r4659  
    22#define DO_GREP_H
    33/*
    4  *  Copyright (c) 2014 International Characters.
     4 *  Copyright (c) 2015 International Characters.
    55 *  This software is licensed to the public under the Open Software License 3.0.
    66 *  icgrep is a trademark of International Characters.
     
    1212#include <string>
    1313#include <stdint.h>
     14#include <array>
    1415
    1516#include "include/simd-lib/bitblock.hpp"
     
    4243
    4344
    44 typedef void (*process_block_fcn)(const Basis_bits &basis_bits, BitBlock process_block_state_data[], Output &output);
    45 
    46 
     45typedef void (*process_block_fcn)(const Basis_bits & basis_bits, BitBlock process_block_state_data[], Output & output);
    4746
    4847class GrepExecutor {
    4948public:
    50     GrepExecutor(size_t process_block_state_size, process_block_fcn process_block):
    51     mCountOnlyOption(false), mShowFileNameOption(false), mShowLineNumberingOption(false),
    52     mProcessBlockStateSize(process_block_state_size),
    53     mProcessBlockFcn(process_block)
    54     {}
     49
     50    GrepExecutor(size_t process_block_state_size, void * process_block)
     51    : mCountOnlyOption(false)
     52    , mShowFileNameOption(false)
     53    , mShowLineNumberingOption(false)
     54    , mProcessBlockStateSize(process_block_state_size)
     55    , mProcessBlockFcn(reinterpret_cast<process_block_fcn>(process_block)) {
     56
     57    }
    5558         
    5659    void setCountOnlyOption(bool doCount = true) {mCountOnlyOption = doCount;}
Note: See TracChangeset for help on using the changeset viewer.