Ignore:
Timestamp:
Dec 9, 2017, 5:05:16 PM (15 months ago)
Author:
nmedfort
Message:

Minor changes and hopefully a fix for bug exposed by base64 test

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/grep_engine.h

    r5761 r5771  
    99#include <kernels/streamset.h>
    1010#include <toolchain/grep_pipeline.h>
    11 #include <string>       // for string
     11#include <string>
    1212#include <vector>
    1313#include <sstream>
    14 #include <mutex>
    1514#include <atomic>
    1615
     
    4039    virtual uint64_t doGrep(const std::string & fileName, const uint32_t fileIdx);
    4140    std::string linePrefix(std::string fileName);
    42     int32_t openFile(const std::string & fileName, std::stringstream * msgstrm);
     41    int32_t openFile(const std::string & fileName, std::ostringstream & msgstrm);
    4342
    4443    Driver * mGrepDriver;
     
    4746    std::atomic<unsigned> mNextFileToPrint;
    4847    std::vector<std::string> inputFiles;
    49     std::vector<std::unique_ptr<std::stringstream>> mResultStrs;
     48    std::vector<std::ostringstream> mResultStrs;
    5049    std::vector<FileStatus> mFileStatus;
    51     std::mutex mWriteMutex;
    52     std::mutex mCacheMutex;
     50    bool grepMatchFound;
    5351
    54 
    55     bool grepMatchFound;
    56    
    5752    std::string mFileSuffix;
    5853    bool mMoveMatchesToEOL;
Note: See TracChangeset for help on using the changeset viewer.