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

fairmq: Fix -Wdefaulted-function-deleted

Browse Source
This commit is contained in:
Dennis Klein 2019-08-21 16:28:55 +02:00 committed by Dennis Klein
parent 46e0796e77
commit 0d182dc18f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fairmq/FairMQChannel.h
View File

@ -68,13 +68,13 @@ class FairMQChannel
FairMQChannel(const FairMQChannel&, const std::string& name); FairMQChannel(const FairMQChannel&, const std::string& name);
/// Move constructor /// Move constructor
FairMQChannel(FairMQChannel&&) = default; FairMQChannel(FairMQChannel&&) = delete;
/// Assignment operator /// Assignment operator
FairMQChannel& operator=(const FairMQChannel&); FairMQChannel& operator=(const FairMQChannel&);
/// Move assignment operator /// Move assignment operator
FairMQChannel& operator=(FairMQChannel&&) = default; FairMQChannel& operator=(FairMQChannel&&) = delete;
/// Destructor /// Destructor
virtual ~FairMQChannel() virtual ~FairMQChannel()

8
test/protocols/_push_pull_multipart.cxx
View File

@ -33,9 +33,9 @@ auto RunSingleThreadedMultipart(string transport, string address) -> void {
config.SetProperty<string>("session", std::to_string(session)); config.SetProperty<string>("session", std::to_string(session));
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config); auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
FairMQTransportFactory* factoryptr = factory.get(); FairMQTransportFactory* factoryptr = factory.get();
auto push = FairMQChannel{"Push", "push", factory}; FairMQChannel push("Push", "push", factory);
ASSERT_TRUE(push.Bind(address)); ASSERT_TRUE(push.Bind(address));
auto pull = FairMQChannel{"Pull", "pull", factory}; FairMQChannel pull("Pull", "pull", factory);
pull.Connect(address); pull.Connect(address);
// TODO validate that fTransportFactory is not nullptr // TODO validate that fTransportFactory is not nullptr
@ -72,9 +72,9 @@ auto RunMultiThreadedMultipart(string transport, string address) -> void
config.SetProperty<int>("io-threads", 1); config.SetProperty<int>("io-threads", 1);
config.SetProperty<size_t>("shm-segment-size", 20000000); config.SetProperty<size_t>("shm-segment-size", 20000000);
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config); auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
auto push = FairMQChannel{"Push", "push", factory}; FairMQChannel push("Push", "push", factory);
ASSERT_TRUE(push.Bind(address)); ASSERT_TRUE(push.Bind(address));
auto pull = FairMQChannel{"Pull", "pull", factory}; FairMQChannel pull("Pull", "pull", factory);
pull.Connect(address); pull.Connect(address);
auto pusher = thread{[&push](){ auto pusher = thread{[&push](){