Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-12-15 07:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

extern/asio: Bump to 1.18.0

Browse Source
This commit is contained in:
Dennis Klein
2020-11-13 03:00:38 +01:00
committed by Dennis Klein
parent c51e88e114
commit 9e2373b55d
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -136,7 +136,7 @@ endif()
if(BUILD_SDK) if(BUILD_SDK)
find_package2(BUNDLED asio find_package2(BUNDLED asio
VERSION 1.13.0 VERSION 1.18.0
) )
if(NOT asio_FOUND) if(NOT asio_FOUND)
build_bundled(asio extern/asio) build_bundled(asio extern/asio)

2
extern/asio vendored

Submodule extern/asio updated: 90f32660cd...be7badc31a

22
fairmq/sdk/AsioAsyncOp.h
View File

@@ -12,6 +12,7 @@
#include <asio/associated_allocator.hpp> #include <asio/associated_allocator.hpp>
#include <asio/associated_executor.hpp> #include <asio/associated_executor.hpp>
#include <asio/executor_work_guard.hpp> #include <asio/executor_work_guard.hpp>
#include <asio/dispatch.hpp>
#include <asio/system_executor.hpp> #include <asio/system_executor.hpp>
#include <chrono> #include <chrono>
#include <exception> #include <exception>
@@ -69,17 +70,16 @@ struct AsioAsyncOpImpl : AsioAsyncOpImplBase<SignatureArgTypes...>
throw RuntimeError("Async operation already completed"); throw RuntimeError("Async operation already completed");
} }
GetEx2().dispatch( asio::dispatch(GetEx2(),
[=, handler = std::move(fHandler)]() mutable { [=, handler = std::move(fHandler)]() mutable {
try { try {
handler(ec, args...); handler(ec, args...);
} catch (const std::exception& e) { } catch (const std::exception& e) {
FAIR_LOG(error) << "Uncaught exception in AsioAsyncOp completion handler: " << e.what(); FAIR_LOG(error) << "Uncaught exception in AsioAsyncOp completion handler: " << e.what();
} catch (...) { } catch (...) {
FAIR_LOG(error) << "Unknown uncaught exception in AsioAsyncOp completion handler."; FAIR_LOG(error) << "Unknown uncaught exception in AsioAsyncOp completion handler.";
} }
}, });
GetAlloc2());
fWork1.reset(); fWork1.reset();
fWork2.reset(); fWork2.reset();

4
fairmq/sdk/AsioBase.h
View File

@@ -9,7 +9,7 @@
#ifndef FAIR_MQ_SDK_ASIOBASE_H #ifndef FAIR_MQ_SDK_ASIOBASE_H
#define FAIR_MQ_SDK_ASIOBASE_H #define FAIR_MQ_SDK_ASIOBASE_H
#include <asio/executor.hpp> #include <asio/any_io_executor.hpp>
#include <fairmq/sdk/Traits.h> #include <fairmq/sdk/Traits.h>
#include <memory> #include <memory>
#include <utility> #include <utility>
@@ -18,7 +18,7 @@ namespace fair {
namespace mq { namespace mq {
namespace sdk { namespace sdk {
using DefaultExecutor = asio::executor; using DefaultExecutor = asio::any_io_executor;
using DefaultAllocator = std::allocator<int>; using DefaultAllocator = std::allocator<int>;
/** /**