Skip to content

Commit 527bf64

Browse files
authored
Merge pull request #93 from alibuild/alibot-cleanup-14249
2 parents d8f90b8 + 79bc19c commit 527bf64

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

Framework/Core/include/Framework/ASoA.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1683,7 +1683,7 @@ class Table
16831683
using table_t = self_t;
16841684

16851685
static constexpr const auto originals = computeOriginals<ref, Ts...>();
1686-
static constexpr const auto originalLabels = []<size_t N, std::array<TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>){ return std::array<const char*, N>{o2::aod::label<refs[Is]>()...}; }.template operator()<originals.size(), originals>(std::make_index_sequence<originals.size()>());
1686+
static constexpr const auto originalLabels = []<size_t N, std::array<TableRef, N> refs, size_t... Is>(std::index_sequence<Is...>) { return std::array<const char*, N>{o2::aod::label<refs[Is]>()...}; }.template operator()<originals.size(), originals>(std::make_index_sequence<originals.size()>());
16871687

16881688
template <size_t N, std::array<TableRef, N> bindings>
16891689
requires(ref.origin_hash == "CONC"_h)

Framework/Core/include/Framework/TableBuilder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ auto spawner(std::shared_ptr<arrow::Table> const& fullTable, const char* name, s
929929
template <typename... C>
930930
auto spawner(framework::pack<C...> columns, std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* name, std::shared_ptr<gandiva::Projector>& projector)
931931
{
932-
std::array<const char*, 1> labels {"original"};
932+
std::array<const char*, 1> labels{"original"};
933933
auto fullTable = soa::ArrowHelpers::joinTables(std::move(tables), std::span<const char* const>{labels});
934934
if (fullTable->num_rows() == 0) {
935935
return makeEmptyTable(name, framework::pack<C...>{});

Framework/Core/test/test_ASoA.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ TEST_CASE("TestJoinedTables")
318318
} catch (RuntimeErrorRef ref) {
319319
REQUIRE(std::string{error_from_ref(ref).what} == "Tables TEST and TEST have different sizes (8 vs 3) and cannot be joined!");
320320
}
321-
322321
}
323322

324323
TEST_CASE("TestConcatTables")

0 commit comments

Comments
 (0)