Skip to content

Commit 03b6b81

Browse files
committed
fixup! DPL Analysis: remove unnecessary instances of selected_pack
1 parent 1f06f34 commit 03b6b81

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

Framework/Core/include/Framework/ASoA.h

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,11 +1032,15 @@ template <typename... C>
10321032
concept has_index = (is_indexing_column<C> || ...);
10331033

10341034
template <is_index_column C>
1035-
requires (!is_self_index_column<C>)
1036-
auto getBinding() -> typename C::binding_t {}
1035+
requires(!is_self_index_column<C>)
1036+
auto getBinding() -> typename C::binding_t
1037+
{
1038+
}
10371039

10381040
template <typename C>
1039-
auto getBinding() -> void {}
1041+
auto getBinding() -> void
1042+
{
1043+
}
10401044

10411045
template <typename D, typename O, typename IP, typename... C>
10421046
struct TableIterator : IP, C... {
@@ -1140,7 +1144,7 @@ struct TableIterator : IP, C... {
11401144
template <typename... CL, typename TA>
11411145
void doSetCurrentIndex(framework::pack<CL...>, TA* current)
11421146
{
1143-
([&current, this](){ if constexpr (is_index_column<CL> && !is_self_index_column<CL>) {CL::setCurrent(current);} }(), ...);
1147+
([&current, this]() { if constexpr (is_index_column<CL> && !is_self_index_column<CL>) {CL::setCurrent(current);} }(), ...);
11441148
}
11451149

11461150
template <typename CL>
@@ -1153,11 +1157,12 @@ struct TableIterator : IP, C... {
11531157
auto getIndexBindingsImpl(framework::pack<Cs...>) const
11541158
{
11551159
std::vector<o2::soa::Binding> result;
1156-
([this, &result](){
1160+
([this, &result]() {
11571161
if constexpr (is_index_column<Cs> && !is_self_index_column<Cs>) {
11581162
result.emplace_back(static_cast<Cs const&>(*this).getCurrentRaw());
11591163
}
1160-
}(), ...);
1164+
}(),
1165+
...);
11611166
return result;
11621167
}
11631168

@@ -1175,15 +1180,15 @@ struct TableIterator : IP, C... {
11751180
template <typename... Cs>
11761181
void doSetCurrentIndexRaw(framework::pack<Cs...> p, std::vector<o2::soa::Binding>&& ptrs)
11771182
{
1178-
([&ptrs, p, this](){ if constexpr (is_index_column<Cs> && !is_self_index_column<Cs>) { Cs::setCurrentRaw(ptrs[framework::has_type_at_v<Cs>(p)]); } }(), ...);
1183+
([&ptrs, p, this]() { if constexpr (is_index_column<Cs> && !is_self_index_column<Cs>) { Cs::setCurrentRaw(ptrs[framework::has_type_at_v<Cs>(p)]); } }(), ...);
11791184
}
11801185

11811186
template <typename... Cs, typename I>
11821187
void doSetCurrentInternal(framework::pack<Cs...>, I const* ptr)
11831188
{
11841189
o2::soa::Binding b;
11851190
b.bind(ptr);
1186-
([&ptr, &b, this](){ if constexpr (is_self_index_column<Cs>) { Cs::setCurrentRaw(b); } }(), ...);
1191+
([&ptr, &b, this]() { if constexpr (is_self_index_column<Cs>) { Cs::setCurrentRaw(b); } }(), ...);
11871192
}
11881193

11891194
void bindExternalIndicesRaw(std::vector<o2::soa::Binding>&& ptrs)
@@ -1378,13 +1383,13 @@ static constexpr std::string getLabelFromTypeForKey(std::string const& key)
13781383
template <typename B, typename... C>
13791384
consteval static bool hasIndexTo(framework::pack<C...>&&)
13801385
{
1381-
return ([](){ if constexpr (is_index_column<C> && !is_self_index_column<C>) { return o2::soa::is_binding_compatible_v<B, typename C::binding_t>(); } else { return false; } }() || ...);
1386+
return ([]() { if constexpr (is_index_column<C> && !is_self_index_column<C>) { return o2::soa::is_binding_compatible_v<B, typename C::binding_t>(); } else { return false; } }() || ...);
13821387
}
13831388

13841389
template <typename B, typename... C>
13851390
consteval static bool hasSortedIndexTo(framework::pack<C...>&&)
13861391
{
1387-
return ([](){if constexpr (is_index_column<C> && !is_self_index_column<C>) { return (C::sorted && o2::soa::is_binding_compatible_v<B, typename C::binding_t>()); } else { return false; }}() || ...);
1392+
return ([]() {if constexpr (is_index_column<C> && !is_self_index_column<C>) { return (C::sorted && o2::soa::is_binding_compatible_v<B, typename C::binding_t>()); } else { return false; } }() || ...);
13881393
}
13891394

13901395
template <typename B, typename Z>
@@ -2054,7 +2059,7 @@ class Table
20542059
template <typename... Cs>
20552060
void doBindInternalIndicesExplicit(framework::pack<Cs...>, o2::soa::Binding binding)
20562061
{
2057-
([this, &binding](){ if constexpr (is_self_index_column<Cs>) { static_cast<Cs>(mBegin).setCurrentRaw(binding); } }(), ...);
2062+
([this, &binding]() { if constexpr (is_self_index_column<Cs>) { static_cast<Cs>(mBegin).setCurrentRaw(binding); } }(), ...);
20582063
}
20592064

20602065
void bindExternalIndicesRaw(std::vector<o2::soa::Binding>&& ptrs)

Framework/Core/include/Framework/GroupedCombinations.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ auto isIndexTo()
4646
}
4747

4848
template <typename T, typename G>
49-
auto isIndexTo() ->std::false_type {}
49+
auto isIndexTo() -> std::false_type
50+
{
51+
}
5052

5153
template <typename T, typename G>
5254
using is_index_to_g_t = decltype(isIndexTo<T, G>());

0 commit comments

Comments
 (0)