diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 8df6e1d..af4f7f1 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -7,17 +7,17 @@ RUN apk add --no-cache --virtual .build-tools git g++ build-base linux-headers c apk add --no-cache --virtual .build-deps curl-dev rapidjson-dev libevent-dev pcre2-dev yaml-cpp-dev && \ git clone https://github.com/ftk/quickjspp --depth=1 && \ cd quickjspp && \ - git submodule update --init && \ + git submodule update --init && \ cmake -DCMAKE_BUILD_TYPE=Release . && \ make quickjs -j2 && \ install -m644 quickjs/libquickjs.a /usr/lib && \ - install -d /usr/include/quickjs/ && \ + install -d /usr/include/quickjs/ && \ install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h /usr/include/quickjs/ && \ install -m644 quickjspp.hpp /usr/include && \ cd .. && \ git clone https://github.com/PerMalmberg/libcron --depth=1 && \ cd libcron && \ - git submodule update --init && \ + git submodule update --init && \ cmake -DCMAKE_BUILD_TYPE=Release . && \ make libcron -j4 && \ install -m644 libcron/out/Release/liblibcron.a /usr/lib/ && \ @@ -26,6 +26,11 @@ RUN apk add --no-cache --virtual .build-tools git g++ build-base linux-headers c install -d /usr/include/date/ && \ install -m644 libcron/externals/date/include/date/* /usr/include/date/ && \ cd .. && \ + git clone https://github.com/ToruNiina/toml11 --depth=1 && \ + cd toml11 && \ + cmake . && \ + make install -j4 && \ + cd .. && \ git clone https://github.com/tindy2013/subconverter --depth=1 && \ cd subconverter && \ cmake -DCMAKE_BUILD_TYPE=Release . && \ diff --git a/src/handler/interfaces.cpp b/src/handler/interfaces.cpp index df412e3..5974e75 100644 --- a/src/handler/interfaces.cpp +++ b/src/handler/interfaces.cpp @@ -921,7 +921,7 @@ template void find_if_exist(const toml::value &v, const toml::key &k, T& target, U&&... args) { if(v.contains(k)) target = toml::find(v, k); - if constexpr (sizeof...(args)) find_if_exist(v, std::forward(args)...); + if constexpr (sizeof...(args) > 0) find_if_exist(v, std::forward(args)...); } std::string join(const string_array &arr, const std::string &delimiter = "|")