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

Replace boost::variant with std::variant

Browse Source
This commit is contained in:
Alexey Rybalchenko
2023-09-15 12:37:19 +02:00
parent 46f50a10ea
commit cacf69d5f6
4 changed files with 59 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fairmq/shmem/Segment.h
View File

@@ -11,10 +11,9 @@
#include <fairmq/shmem/Common.h>
#include <fairmq/shmem/Monitor.h>
#include <boost/variant.hpp>
#include <cstdint>
#include <string>
#include <variant>
namespace fair::mq::shmem
{
@@ -44,12 +43,12 @@ struct Segment
Register(shmId, id, AllocationAlgorithm::rbtree_best_fit);
}
size_t GetSize() const { return boost::apply_visitor(SegmentSize(), fSegment); }
void* GetData() { return boost::apply_visitor(SegmentAddress(), fSegment); }
size_t GetSize() const { return std::visit([](auto& s){ return s.get_size(); }, fSegment); }
void* GetData() { return std::visit([](auto& s){ return s.get_address(); }, fSegment); }
size_t GetFreeMemory() const { return boost::apply_visitor(SegmentFreeMemory(), fSegment); }
size_t GetFreeMemory() const { return std::visit([](auto& s){ return s.get_free_memory(); }, fSegment); }
void Zero() { boost::apply_visitor(SegmentMemoryZeroer(), fSegment); }
void Zero() { std::visit([](auto& s){ return s.zero_free_memory(); }, fSegment); }
void Lock()
{
if (mlock(GetData(), GetSize()) == -1) {
@@ -63,7 +62,7 @@ struct Segment
}
private:
boost::variant<RBTreeBestFitSegment, SimpleSeqFitSegment> fSegment;
std::variant<RBTreeBestFitSegment, SimpleSeqFitSegment> fSegment;
static void Register(const std::string& shmId, uint16_t id, AllocationAlgorithm allocAlgo)
{