Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 16:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDK: Do not require r-value refs

Browse Source 
I mistakenly thought they were forwarding refs.
This commit is contained in:
Dennis Klein 2020-01-24 04:39:21 +01:00 committed by Dennis Klein
parent d608abf31c
commit 9544de0647
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fairmq/sdk/AsioAsyncOp.h
View File

@ -49,7 +49,7 @@ struct AsioAsyncOpImpl : AsioAsyncOpImplBase<SignatureArgTypes...>
using Executor2 = typename asio::associated_executor<Handler, Executor1>::type; using Executor2 = typename asio::associated_executor<Handler, Executor1>::type;
/// Ctor /// Ctor
AsioAsyncOpImpl(const Executor1& ex1, Allocator1&& alloc1, Handler&& handler) AsioAsyncOpImpl(const Executor1& ex1, Allocator1 alloc1, Handler&& handler)
: fWork1(ex1) : fWork1(ex1)
, fWork2(asio::get_associated_executor(handler, ex1)) , fWork2(asio::get_associated_executor(handler, ex1))
, fHandler(std::move(handler)) , fHandler(std::move(handler))
@ -149,7 +149,7 @@ struct AsioAsyncOp<Executor,
/// Ctor with handler /// Ctor with handler
template<typename Handler> template<typename Handler>
AsioAsyncOp(Executor&& ex1, Allocator&& alloc1, Handler&& handler) AsioAsyncOp(Executor ex1, Allocator alloc1, Handler&& handler)
: AsioAsyncOp() : AsioAsyncOp()
{ {
// Async operation type to be allocated and constructed // Async operation type to be allocated and constructed
@ -165,8 +165,8 @@ struct AsioAsyncOp<Executor,
auto mem(std::allocator_traits<OpAllocator>::allocate(opAlloc, 1)); auto mem(std::allocator_traits<OpAllocator>::allocate(opAlloc, 1));
// Construct object // Construct object
auto ptr(new (mem) Op(std::forward<Executor>(ex1), auto ptr(new (mem) Op(std::move(ex1),
std::forward<Allocator>(alloc1), std::move(alloc1),
std::forward<Handler>(handler))); std::forward<Handler>(handler)));
// Assign ownership to this object // Assign ownership to this object
@ -177,8 +177,8 @@ struct AsioAsyncOp<Executor,
/// Ctor with handler #2 /// Ctor with handler #2
template<typename Handler> template<typename Handler>
AsioAsyncOp(Executor&& ex1, Handler&& handler) AsioAsyncOp(Executor ex1, Handler&& handler)
: AsioAsyncOp(std::forward<Executor>(ex1), Allocator(), std::forward<Handler>(handler)) : AsioAsyncOp(std::move(ex1), Allocator(), std::forward<Handler>(handler))
{} {}
/// Ctor with handler #3 /// Ctor with handler #3