diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt index 39244af3f..18c2a0d87 100644 --- a/fairmq/CMakeLists.txt +++ b/fairmq/CMakeLists.txt @@ -162,7 +162,10 @@ if(BUILD_FAIRMQ) ############################ # preprocessor definitions # ############################ - target_compile_definitions(${target} PUBLIC BOOST_ERROR_CODE_HEADER_ONLY) + target_compile_definitions(${target} PUBLIC + BOOST_ERROR_CODE_HEADER_ONLY + BOOST_ASIO_HAS_HAS_STD_CHRONO + ) if(FAIRMQ_DEBUG_MODE) target_compile_definitions(${target} PUBLIC FAIRMQ_DEBUG_MODE) endif() diff --git a/fairmq/shmem/Manager.h b/fairmq/shmem/Manager.h index b6bec69eb..90265a775 100644 --- a/fairmq/shmem/Manager.h +++ b/fairmq/shmem/Manager.h @@ -19,7 +19,6 @@ #include -#include #include #include #include @@ -28,6 +27,7 @@ #include #include // max +#include #include #include // max_align_t #include // getenv diff --git a/fairmq/tools/Process.cxx b/fairmq/tools/Process.cxx index 179d5daf6..13e769bb5 100644 --- a/fairmq/tools/Process.cxx +++ b/fairmq/tools/Process.cxx @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * + * Copyright (C) 2017-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * * This software is distributed under the terms of the * * GNU Lesser General Public Licence (LGPL) version 3, * @@ -10,8 +10,8 @@ #include #include -#include #include +#include #include // kill, signals #include #include @@ -77,8 +77,10 @@ execute_result execute(const string& cmd, const string& prefix, const string& in bp::async_pipe errorPipe(ios); const string delimiter = "\n"; - ba::deadline_timer inputTimer(ios, boost::posix_time::milliseconds(1000)); // NOLINT - ba::deadline_timer signalTimer(ios, boost::posix_time::milliseconds(2000)); // NOLINT + ba::steady_timer inputTimer(ios); + inputTimer.expires_after(std::chrono::milliseconds(1000)); // NOLINT + ba::steady_timer signalTimer(ios); + signalTimer.expires_after(std::chrono::milliseconds(2000)); // NOLINT // child process bp::child c(cmd, bp::std_out > outputPipe, bp::std_err > errorPipe, bp::std_in < inputPipe);