From 4dc37efc12e6f77735fac11be273f1f63f3a8d59 Mon Sep 17 00:00:00 2001 From: mkrzewic Date: Tue, 18 Dec 2018 15:08:43 +0100 Subject: [PATCH] Allow implicit conversion factory->resource reduces boilerplate --- fairmq/FairMQTransportFactory.h | 1 + test/memory_resources/_memory_resources.cxx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fairmq/FairMQTransportFactory.h b/fairmq/FairMQTransportFactory.h index c4a74fd3..fb3d3b84 100644 --- a/fairmq/FairMQTransportFactory.h +++ b/fairmq/FairMQTransportFactory.h @@ -43,6 +43,7 @@ class FairMQTransportFactory /// Get a pointer to the associated polymorphic memory resource fair::mq::ChannelResource* GetMemoryResource() { return &fMemoryResource; } + operator fair::mq::ChannelResource*() { return &fMemoryResource; } /// @brief Create empty FairMQMessage /// @return pointer to FairMQMessage diff --git a/test/memory_resources/_memory_resources.cxx b/test/memory_resources/_memory_resources.cxx index d01adddc..74ff670a 100644 --- a/test/memory_resources/_memory_resources.cxx +++ b/test/memory_resources/_memory_resources.cxx @@ -127,10 +127,11 @@ TEST(MemoryResources, getMessage_test) v.emplace_back(5); v.emplace_back(6); void* vectorBeginPtr = &v[0]; - message = getMessage(std::move(v), allocSHM); + message = getMessage(std::move(v), *factorySHM); EXPECT_TRUE(message != nullptr); EXPECT_TRUE(message->GetData() != vectorBeginPtr); } + EXPECT_TRUE(message->GetSize() == 3 * sizeof(testData)); messageArray = static_cast(message->GetData()); EXPECT_TRUE(messageArray[0] == 4 && messageArray[1] == 5 && messageArray[2] == 6);