Changeset 5518 for icGREP


Ignore:
Timestamp:
Jun 20, 2017, 12:43:54 PM (22 months ago)
Author:
faldebey
Message:

cleanup

Location:
icGREP/icgrep-devel/icgrep
Files:
8 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/CMakeLists.txt

    r5517 r5518  
    110110add_executable(array-test array-test.cpp kernels/alignedprint.cpp)
    111111add_executable(lz4d lz4d.cpp lz4FrameDecoder.cpp kernels/cc_kernel.cpp kernels/lz4_index_decoder.cpp kernels/lz4_bytestream_decoder.cpp)
    112 
     112add_executable(core combine/core.cpp combine/regexGen.cpp combine/stringGen.cpp combine/icgrep-test/icgrep-test.cpp combine/pugixml/src/pugixml.cpp grep_interface.cpp grep_engine.cpp kernels/scanmatchgen.cpp kernels/cc_kernel.cpp kernels/cc_scan_kernel.cpp kernels/linebreak_kernel.cpp kernels/streams_merge.cpp kernels/grep_kernel.cpp kernels/until_n.cpp)
    113113
    114114
     
    120120target_link_libraries (array-test PabloADT CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
    121121target_link_libraries (lz4d PabloADT RegExpCompiler CodeGen ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES} ${CUDA_LIB})
     122target_link_libraries (core RegExpCompiler ${REQ_LLVM_LIBRARIES} ${Boost_LIBRARIES})
    122123
    123124IF(ENABLE_MULTIPLEXING)
  • icGREP/icgrep-devel/icgrep/combine/core.cpp

    r5516 r5518  
    66#include <iostream>
    77#include <algorithm>
    8 #include "regexgen.h"
     8#include "regexGen.h"
    99#include "stringGen.h"
    1010#include <boost/program_options.hpp>
  • icGREP/icgrep-devel/icgrep/combine/stringGen.cpp

    r5516 r5518  
    9090        std::vector<string> cpSet;
    9191        unsigned int max = 0x10FFFF;
    92         for (auto cp = 0; cp < max; ++cp){
     92        for (unsigned cp = 0; cp < max; ++cp){
    9393                if (cp < 0xD800 || cp > 0xDFFF) {
    9494                        std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> converter;
Note: See TracChangeset for help on using the changeset viewer.