This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 11daede7452bae5f4afb48ca4a0b5abd8abb99b2 Author: Marton Szasz <[email protected]> AuthorDate: Wed Feb 23 08:08:31 2022 +0100 MINIFICPP-1756 fix libstdc++10 issue Signed-off-by: Adam Debreceni <[email protected]> This closes #1263 --- libminifi/CMakeLists.txt | 2 +- libminifi/include/utils/TimeUtil.h | 2 ++ libminifi/test/unit/TimeUtilTests.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libminifi/CMakeLists.txt b/libminifi/CMakeLists.txt index e5f1c08..00eec75 100644 --- a/libminifi/CMakeLists.txt +++ b/libminifi/CMakeLists.txt @@ -98,7 +98,7 @@ if(NOT EXCLUDE_BOOST) endif() include(RangeV3) -list(APPEND LIBMINIFI_LIBRARIES yaml-cpp ZLIB::ZLIB concurrentqueue RapidJSON spdlog cron Threads::Threads gsl-lite libsodium range-v3 expected-lite) +list(APPEND LIBMINIFI_LIBRARIES yaml-cpp ZLIB::ZLIB concurrentqueue RapidJSON spdlog cron Threads::Threads gsl-lite libsodium range-v3 expected-lite date::date) if(NOT WIN32) list(APPEND LIBMINIFI_LIBRARIES OSSP::libuuid++) endif() diff --git a/libminifi/include/utils/TimeUtil.h b/libminifi/include/utils/TimeUtil.h index 0f83e19..b7d723f 100644 --- a/libminifi/include/utils/TimeUtil.h +++ b/libminifi/include/utils/TimeUtil.h @@ -31,6 +31,8 @@ #include <functional> #include <algorithm> +#include "date/date.h" + #define TIME_FORMAT "%Y-%m-%d %H:%M:%S" namespace org { diff --git a/libminifi/test/unit/TimeUtilTests.cpp b/libminifi/test/unit/TimeUtilTests.cpp index abb86af..574cc83 100644 --- a/libminifi/test/unit/TimeUtilTests.cpp +++ b/libminifi/test/unit/TimeUtilTests.cpp @@ -99,7 +99,7 @@ TEST_CASE("Test time conversion", "[testtimeconversion]") { TEST_CASE("Test system_clock epoch", "[systemclockepoch]") { using namespace std::chrono; time_point<system_clock> epoch; - time_point<system_clock> unix_epoch_plus_3e9_sec = sys_days(January / 24 / 2065) + 5h + 20min; + time_point<system_clock> unix_epoch_plus_3e9_sec = date::sys_days(date::January / 24 / 2065) + 5h + 20min; REQUIRE(epoch.time_since_epoch() == 0s); REQUIRE(unix_epoch_plus_3e9_sec.time_since_epoch() == 3000000000s); }
