Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Framework/Core/include/Framework/ASoA.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
#include <cstring>
#include <gsl/span> // IWYU pragma: export

namespace fair::mq::shmem {
namespace fair::mq::shmem
{
struct MetaHeader;
}

Expand Down Expand Up @@ -2518,10 +2519,11 @@ consteval static std::string_view namespace_prefix()
decltype(auto) _Getter_() const \
{ \
auto& [handle, segment, size] = *mColumnIterator; \
auto span = std::span<std::byte>{(*ptrRec)(fair::mq::shmem::MetaHeader{ \
static_cast<size_t>(size), \
0, handle, 0, 0, \
static_cast<uint16_t>(segment), true}), static_cast<size_t>(size)}; \
auto span = std::span<std::byte>{(*ptrRec)(fair::mq::shmem::MetaHeader{ \
static_cast<size_t>(size), \
0, handle, 0, 0, \
static_cast<uint16_t>(segment), true}), \
static_cast<size_t>(size)}; \
if constexpr (std::same_as<_ConcreteType_, std::span<std::byte>>) { \
return span; \
} else { \
Expand Down
3 changes: 2 additions & 1 deletion Framework/Core/include/Framework/AnalysisTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,8 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args)
// finalize outputs
homogeneous_apply_refs_sized<numElements>([&pc](auto& element) { return analysis_task_parsers::finalizeOutput(pc, element); }, *task.get());
};
}};
}
};

return {
name,
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/src/FairMQDeviceProxy.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ PointerReconstructor FairMQDeviceProxy::getShmPointerReconstructor(InputSpec con
}
}
if (c.value != ChannelIndex::INVALID) {
return {[transport = getInputChannel(c)->Transport()](fair::mq::shmem::MetaHeader&& meta){ return reinterpret_cast<std::byte*>(fair::mq::shmem::GetDataAddressFromHandle(*transport, meta)); }};
return {[transport = getInputChannel(c)->Transport()](fair::mq::shmem::MetaHeader&& meta) { return reinterpret_cast<std::byte*>(fair::mq::shmem::GetDataAddressFromHandle(*transport, meta)); }};
}
return {};
}
Expand Down
Loading