Skip to content

Commit e9c0ca2

Browse files
committed
fixup! DPL Analysis: remove unnecessary instances of selected_pack
1 parent c9181b1 commit e9c0ca2

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
@@ -1027,11 +1027,15 @@ template <typename... C>
10271027
concept has_index = (is_indexing_column<C> || ...);
10281028

10291029
template <is_index_column C>
1030-
requires (!is_self_index_column<C>)
1031-
auto getBinding() -> typename C::binding_t {}
1030+
requires(!is_self_index_column<C>)
1031+
auto getBinding() -> typename C::binding_t
1032+
{
1033+
}
10321034

10331035
template <typename C>
1034-
auto getBinding() -> void {}
1036+
auto getBinding() -> void
1037+
{
1038+
}
10351039

10361040
template <typename D, typename O, typename IP, typename... C>
10371041
struct TableIterator : IP, C... {
@@ -1135,7 +1139,7 @@ struct TableIterator : IP, C... {
11351139
template <typename... CL, typename TA>
11361140
void doSetCurrentIndex(framework::pack<CL...>, TA* current)
11371141
{
1138-
([&current, this](){ if constexpr (is_index_column<CL> && !is_self_index_column<CL>) {CL::setCurrent(current);} }(), ...);
1142+
([&current, this]() { if constexpr (is_index_column<CL> && !is_self_index_column<CL>) {CL::setCurrent(current);} }(), ...);
11391143
}
11401144

11411145
template <typename CL>
@@ -1148,11 +1152,12 @@ struct TableIterator : IP, C... {
11481152
auto getIndexBindingsImpl(framework::pack<Cs...>) const
11491153
{
11501154
std::vector<o2::soa::Binding> result;
1151-
([this, &result](){
1155+
([this, &result]() {
11521156
if constexpr (is_index_column<Cs> && !is_self_index_column<Cs>) {
11531157
result.emplace_back(static_cast<Cs const&>(*this).getCurrentRaw());
11541158
}
1155-
}(), ...);
1159+
}(),
1160+
...);
11561161
return result;
11571162
}
11581163

@@ -1170,15 +1175,15 @@ struct TableIterator : IP, C... {
11701175
template <typename... Cs>
11711176
void doSetCurrentIndexRaw(framework::pack<Cs...> p, std::vector<o2::soa::Binding>&& ptrs)
11721177
{
1173-
([&ptrs, p, this](){ if constexpr (is_index_column<Cs> && !is_self_index_column<Cs>) { Cs::setCurrentRaw(ptrs[framework::has_type_at_v<Cs>(p)]); } }(), ...);
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)]); } }(), ...);
11741179
}
11751180

11761181
template <typename... Cs, typename I>
11771182
void doSetCurrentInternal(framework::pack<Cs...>, I const* ptr)
11781183
{
11791184
o2::soa::Binding b;
11801185
b.bind(ptr);
1181-
([&ptr, &b, this](){ if constexpr (is_self_index_column<Cs>) { Cs::setCurrentRaw(b); } }(), ...);
1186+
([&ptr, &b, this]() { if constexpr (is_self_index_column<Cs>) { Cs::setCurrentRaw(b); } }(), ...);
11821187
}
11831188

11841189
void bindExternalIndicesRaw(std::vector<o2::soa::Binding>&& ptrs)
@@ -1373,13 +1378,13 @@ static constexpr std::string getLabelFromTypeForKey(std::string const& key)
13731378
template <typename B, typename... C>
13741379
consteval static bool hasIndexTo(framework::pack<C...>&&)
13751380
{
1376-
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; } }() || ...);
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; } }() || ...);
13771382
}
13781383

13791384
template <typename B, typename... C>
13801385
consteval static bool hasSortedIndexTo(framework::pack<C...>&&)
13811386
{
1382-
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; }}() || ...);
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; } }() || ...);
13831388
}
13841389

13851390
template <typename B, typename Z>
@@ -2064,7 +2069,7 @@ class Table
20642069
template <typename... Cs>
20652070
void doBindInternalIndicesExplicit(framework::pack<Cs...>, o2::soa::Binding binding)
20662071
{
2067-
([this, &binding](){ if constexpr (is_self_index_column<Cs>) { static_cast<Cs>(mBegin).setCurrentRaw(binding); } }(), ...);
2072+
([this, &binding]() { if constexpr (is_self_index_column<Cs>) { static_cast<Cs>(mBegin).setCurrentRaw(binding); } }(), ...);
20682073
}
20692074

20702075
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)