From ac1da4db669376ed93f85e6bebe53f1e9bacd45b Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Thu, 5 Jan 2017 14:15:05 +0100 Subject: [PATCH] Require std::move when adding existing message to FairMQParts. --- fairmq/FairMQParts.h | 8 ++++---- fairmq/devices/FairMQMultiplier.cxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fairmq/FairMQParts.h b/fairmq/FairMQParts.h index e734e4a0..272e913b 100644 --- a/fairmq/FairMQParts.h +++ b/fairmq/FairMQParts.h @@ -41,10 +41,10 @@ class FairMQParts /// Adds part (std::unique_ptr&) to the container (move) /// @param msg unique pointer to FairMQMessage /// lvalue ref (move not required when passing argument) - inline void AddPart(std::unique_ptr& msg) - { - fParts.push_back(std::move(msg)); - } + // inline void AddPart(std::unique_ptr& msg) + // { + // fParts.push_back(std::move(msg)); + // } /// Adds part (std::unique_ptr&) to the container (move) /// @param msg unique pointer to FairMQMessage diff --git a/fairmq/devices/FairMQMultiplier.cxx b/fairmq/devices/FairMQMultiplier.cxx index d0ab9092..58613ab4 100644 --- a/fairmq/devices/FairMQMultiplier.cxx +++ b/fairmq/devices/FairMQMultiplier.cxx @@ -81,7 +81,7 @@ bool FairMQMultiplier::HandleMultipartData(FairMQParts& payload, int /*index*/) { FairMQMessagePtr msgCopy(fTransportFactory->CreateMessage()); msgCopy->Copy(payload.At(k)); - parts.AddPart(msgCopy); + parts.AddPart(std::move(msgCopy)); } Send(parts, fOutChannelNames.at(i), j); @@ -98,7 +98,7 @@ bool FairMQMultiplier::HandleMultipartData(FairMQParts& payload, int /*index*/) { FairMQMessagePtr msgCopy(fTransportFactory->CreateMessage()); msgCopy->Copy(payload.At(k)); - parts.AddPart(msgCopy); + parts.AddPart(std::move(msgCopy)); } Send(parts, fOutChannelNames.back(), i);