Skip to content

Commit 633e6a4

Browse files
committed
fixup! DPL Analysis: use shm metadata in CCDB tables instead of binary view
1 parent 69a8df5 commit 633e6a4

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

Framework/Core/include/Framework/DataAllocator.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242

4343
// Do not change this for a full inclusion of fair::mq::Device.
4444
#include <fairmq/FwdDecls.h>
45-
#include <shmem/Message.h>
45+
#include <fairmq/Version.h>
46+
#if (FAIRMQ_VERSION_DEC >= 111000)
47+
#include <fairmq/shmem/Message.h>
48+
#endif
4649

4750
namespace arrow
4851
{
@@ -604,9 +607,11 @@ DataAllocator::CacheId DataAllocator::adoptContainer(const Output& spec, Contain
604607
// clone is indistinguishable from the original, we can keep sending
605608
// the original.
606609
cacheId.value = context.addToCache(payloadMessage);
610+
#if (FAIRMQ_VERSION_DEC >= 111000)
607611
auto meta = dynamic_cast<fair::mq::shmem::Message*>(payloadMessage.get())->GetMeta();
608612
cacheId.handle = meta.fHandle;
609613
cacheId.segment = meta.fSegmentId;
614+
#endif
610615
}
611616

612617
context.add<MessageContext::TrivialObject>(std::move(headerMessage), std::move(payloadMessage), routeIndex);

0 commit comments

Comments
 (0)