From 8ed0a620fdaac408c10919b75b0fd0e7b18e3c78 Mon Sep 17 00:00:00 2001 From: Tindy X <49061470+tindy2013@users.noreply.github.com> Date: Mon, 24 Feb 2020 00:19:50 +0800 Subject: [PATCH] Fix compile error on some platform Update build script. --- scripts/build.alpine.release.sh | 4 ++-- src/subexport.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/build.alpine.release.sh b/scripts/build.alpine.release.sh index 1c5130d..6aa8990 100644 --- a/scripts/build.alpine.release.sh +++ b/scripts/build.alpine.release.sh @@ -8,11 +8,11 @@ apk add openssl-dev openssl-libs-static curl curl-dev curl-static nghttp2-static git clone https://github.com/jbeder/yaml-cpp cd yaml-cpp cmake -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF . > /dev/null -make install -j4 > /dev/null +make install -j2 > /dev/null cd .. cmake . -make -j4 +make -j2 g++ -o base/subconverter CMakeFiles/subconverter.dir/src/*.o -static -lpcre2-8 -levent -lyaml-cpp -lcurl -lnghttp2 -lssl -lcrypto -lz -lbz2 -ldl -lpthread -O3 -s cd base diff --git a/src/subexport.cpp b/src/subexport.cpp index 55f870d..210e93a 100644 --- a/src/subexport.cpp +++ b/src/subexport.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -249,7 +250,7 @@ bool matchRange(std::string &range, int target) string_array vArray = split(range, ","); bool match = false; int range_begin = 0, range_end = 0; - const std::string reg_num = "\\d+", reg_range = "(\\d+)-(\\d+)", reg_not = "\\!(\\d+)", reg_not_range = "\\!(\\d+)-(\\d+)", reg_less = "(\\d+)-", reg_more = "(\\d+)\+"; + const std::string reg_num = "\\d+", reg_range = "(\\d+)-(\\d+)", reg_not = "\\!(\\d+)", reg_not_range = "\\!(\\d+)-(\\d+)", reg_less = "(\\d+)-", reg_more = "(\\d+)\\+"; for(std::string &x : vArray) { if(regMatch(x, reg_num))