Skip to content

Commit 430ed27

Browse files
authored
Merge pull request #140 from alibuild/alibot-cleanup-15516
2 parents 633e6a4 + 34e0edc commit 430ed27

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

Framework/Core/include/Framework/ASoA.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
#include <cstring>
3838
#include <gsl/span> // IWYU pragma: export
3939

40-
namespace fair::mq::shmem {
40+
namespace fair::mq::shmem
41+
{
4142
struct MetaHeader;
4243
}
4344

@@ -2518,10 +2519,11 @@ consteval static std::string_view namespace_prefix()
25182519
decltype(auto) _Getter_() const \
25192520
{ \
25202521
auto& [handle, segment, size] = *mColumnIterator; \
2521-
auto span = std::span<std::byte>{(*ptrRec)(fair::mq::shmem::MetaHeader{ \
2522-
static_cast<size_t>(size), \
2523-
0, handle, 0, 0, \
2524-
static_cast<uint16_t>(segment), true}), static_cast<size_t>(size)}; \
2522+
auto span = std::span<std::byte>{(*ptrRec)(fair::mq::shmem::MetaHeader{ \
2523+
static_cast<size_t>(size), \
2524+
0, handle, 0, 0, \
2525+
static_cast<uint16_t>(segment), true}), \
2526+
static_cast<size_t>(size)}; \
25252527
if constexpr (std::same_as<_ConcreteType_, std::span<std::byte>>) { \
25262528
return span; \
25272529
} else { \

Framework/Core/include/Framework/AnalysisTask.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,8 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args)
736736
// finalize outputs
737737
homogeneous_apply_refs_sized<numElements>([&pc](auto& element) { return analysis_task_parsers::finalizeOutput(pc, element); }, *task.get());
738738
};
739-
}};
739+
}
740+
};
740741

741742
return {
742743
name,

Framework/Core/src/FairMQDeviceProxy.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ PointerReconstructor FairMQDeviceProxy::getShmPointerReconstructor(InputSpec con
380380
}
381381
}
382382
if (c.value != ChannelIndex::INVALID) {
383-
return {[transport = getInputChannel(c)->Transport()](fair::mq::shmem::MetaHeader&& meta){ return reinterpret_cast<std::byte*>(fair::mq::shmem::GetDataAddressFromHandle(*transport, meta)); }};
383+
return {[transport = getInputChannel(c)->Transport()](fair::mq::shmem::MetaHeader&& meta) { return reinterpret_cast<std::byte*>(fair::mq::shmem::GetDataAddressFromHandle(*transport, meta)); }};
384384
}
385385
return {};
386386
}

0 commit comments

Comments
 (0)