Rename adoptVector into getVector

FairRootGroup · Oct 29, 2018 · 8334282 · 8334282
1 parent 4535b20
commit 8334282
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/fairmq/MemoryResourceTools.h b/fairmq/MemoryResourceTools.h
@@ -66,7 +66,7 @@ FairMQMessagePtr getMessage(ContainerT &&container_, FairMQMemoryResource *targe
 /// Resource must be kept alive throughout the lifetime of the
 /// container and associated message.
 template<typename ElemT>
-std::vector<const ElemT, boost::container::pmr::polymorphic_allocator<const ElemT>> adoptVector(
+std::vector<const ElemT, boost::container::pmr::polymorphic_allocator<const ElemT>> getVector(
     size_t nelem,
     SpectatorMessageResource *resource)
 {
@@ -78,7 +78,7 @@ std::vector<const ElemT, boost::container::pmr::polymorphic_allocator<const Elem
 /// Return a vector of const ElemT, takes ownership of the message
 template<typename ElemT>
 std::vector<const ElemT, OwningMessageSpectatorAllocator<const ElemT>>
-    adoptVector(size_t nelem, FairMQMessagePtr message)
+    getVector(size_t nelem, FairMQMessagePtr message)
 {
     return std::vector<const ElemT, OwningMessageSpectatorAllocator<const ElemT>>(
         nelem,
@@ -93,7 +93,7 @@ std::vector<const ElemT, OwningMessageSpectatorAllocator<const ElemT>>
 // semantics for access.
 // use auto or decltype to catch the return type.
 // template<typename ElemT>
-// auto adoptVector(size_t nelem, FairMQMessage* message)
+// auto getVector(size_t nelem, FairMQMessage* message)
 //{
 //    using DataType = std::vector<ElemT, ByteSpectatorAllocator>;
 //

diff --git a/test/memory_resources/_memory_resources.cxx b/test/memory_resources/_memory_resources.cxx
@@ -166,7 +166,7 @@ TEST(MemoryResources, adoptVector_test)
     std::memcpy(message->GetData(), tmpBuf, 3 * sizeof(testData));
 
     auto adoptedOwner =
-        adoptVector<testData>(3, std::move(message));
+        getVector<testData>(3, std::move(message));
     EXPECT_TRUE(adoptedOwner[0].i == 3);
     EXPECT_TRUE(adoptedOwner[1].i == 2);
     EXPECT_TRUE(adoptedOwner[2].i == 1);