Skip to content

DPL: move to std::span in some tests #15060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ktf wants to merge 1 commit into
base: dev
Choose a base branch
from
+6 −6
Open

DPL: move to std::span in some tests #15060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Framework/Core/test/test_DataAllocator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ DataProcessorSpec getSinkSpec()
auto object1 = pc.inputs().get<o2::test::TriviallyCopyable>("input1");
ASSERT_ERROR(object1 == o2::test::TriviallyCopyable(42, 23, 0xdead));
LOG(info) << "extracting span of o2::test::TriviallyCopyable from input1";
auto object1span = pc.inputs().get<gsl::span<o2::test::TriviallyCopyable>>("input1");
auto object1span = pc.inputs().get<std::span<o2::test::TriviallyCopyable>>("input1");
ASSERT_ERROR(object1span.size() == 1);
ASSERT_ERROR(sizeof(typename decltype(object1span)::value_type) == sizeof(o2::test::TriviallyCopyable));
// check the additional header on the stack
Expand Down Expand Up @@ -309,7 +309,7 @@ DataProcessorSpec getSinkSpec()
ASSERT_ERROR(object11 == o2::test::TriviallyCopyable(42, 23, 0xdead));

LOG(info) << "extracting the original std::vector<o2::test::TriviallyCopyable> as span from input12";
auto object12 = pc.inputs().get<gsl::span<o2::test::TriviallyCopyable>>("input12");
auto object12 = pc.inputs().get<std::span<o2::test::TriviallyCopyable>>("input12");
ASSERT_ERROR(object12.size() == 2);
ASSERT_ERROR((object12[0] == o2::test::TriviallyCopyable{42, 23, 0xdead}));
ASSERT_ERROR((object12[1] == o2::test::TriviallyCopyable{10, 20, 0xacdc}));
Expand Down Expand Up @@ -337,7 +337,7 @@ DataProcessorSpec getSinkSpec()
ASSERT_ERROR(object16[0] == 10 && object16[1] == 20 && object16[2] == 30);

LOG(info) << "extracting PMR vector";
auto pmrspan = pc.inputs().get<gsl::span<o2::test::TriviallyCopyable>>("inputPMR");
auto pmrspan = pc.inputs().get<std::span<o2::test::TriviallyCopyable>>("inputPMR");
ASSERT_ERROR((pmrspan[0] == o2::test::TriviallyCopyable{1, 2, 3}));
auto dataref = pc.inputs().get<DataRef>("inputPMR");
auto header = DataRefUtils::getHeader<const o2::header::DataHeader*>(dataref);
Expand Down Expand Up @@ -417,8 +417,8 @@ DataProcessorSpec getSpectatorSinkSpec()
}
}
ASSERT_ERROR(nPart == 3);
LOG(info) << "extracting the forwarded gsl::span<o2::test::TriviallyCopyable> as span from input12";
auto object12 = pc.inputs().get<gsl::span<o2::test::TriviallyCopyable>>("input12");
LOG(info) << "extracting the forwarded std::span<o2::test::TriviallyCopyable> as span from input12";
auto object12 = pc.inputs().get<std::span<o2::test::TriviallyCopyable>>("input12");
ASSERT_ERROR(object12.size() == 2);
ASSERT_ERROR((object12[0] == o2::test::TriviallyCopyable{42, 23, 0xdead}));
ASSERT_ERROR((object12[1] == o2::test::TriviallyCopyable{10, 20, 0xacdc}));
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_FairMQ.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ template <typename I, typename F>
auto forEach(I begin, I end, F&& function)
{

using span = gsl::span<const std::byte>;
using span = std::span<const std::byte>;
using SPAN_SIZE_TYPE = span::size_type;
using gsl::narrow_cast;
for (auto it = begin; it != end; ++it) {
Expand Down