Skip to content

Commit a2312ae

Browse files
committed
fixup! DPL Analysis: remove unnecessary instances of selected_pack
1 parent 9a6f531 commit a2312ae

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

10371037
template <is_index_column C>
1038-
requires (!is_self_index_column<C>)
1039-
auto getBinding() -> typename C::binding_t {}
1038+
requires(!is_self_index_column<C>)
1039+
auto getBinding() -> typename C::binding_t
1040+
{
1041+
}
10401042

10411043
template <typename C>
1042-
auto getBinding() -> void {}
1044+
auto getBinding() -> void
1045+
{
1046+
}
10431047

10441048
template <typename D, typename O, typename IP, typename... C>
10451049
struct TableIterator : IP, C... {
@@ -1143,7 +1147,7 @@ struct TableIterator : IP, C... {
11431147
template <typename... CL, typename TA>
11441148
void doSetCurrentIndex(framework::pack<CL...>, TA* current)
11451149
{
1146-
([&current, this](){ if constexpr (is_index_column<CL> && !is_self_index_column<CL>) {CL::setCurrent(current);} }(), ...);
1150+
([&current, this]() { if constexpr (is_index_column<CL> && !is_self_index_column<CL>) {CL::setCurrent(current);} }(), ...);
11471151
}
11481152

11491153
template <typename CL>
@@ -1156,11 +1160,12 @@ struct TableIterator : IP, C... {
11561160
auto getIndexBindingsImpl(framework::pack<Cs...>) const
11571161
{
11581162
std::vector<o2::soa::Binding> result;
1159-
([this, &result](){
1163+
([this, &result]() {
11601164
if constexpr (is_index_column<Cs> && !is_self_index_column<Cs>) {
11611165
result.emplace_back(static_cast<Cs const&>(*this).getCurrentRaw());
11621166
}
1163-
}(), ...);
1167+
}(),
1168+
...);
11641169
return result;
11651170
}
11661171

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

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

11921197
void bindExternalIndicesRaw(std::vector<o2::soa::Binding>&& ptrs)
@@ -1381,13 +1386,13 @@ static constexpr std::string getLabelFromTypeForKey(std::string const& key)
13811386
template <typename B, typename... C>
13821387
consteval static bool hasIndexTo(framework::pack<C...>&&)
13831388
{
1384-
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; } }() || ...);
1389+
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; } }() || ...);
13851390
}
13861391

13871392
template <typename B, typename... C>
13881393
consteval static bool hasSortedIndexTo(framework::pack<C...>&&)
13891394
{
1390-
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; }}() || ...);
1395+
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; } }() || ...);
13911396
}
13921397

13931398
template <typename B, typename Z>
@@ -2057,7 +2062,7 @@ class Table
20572062
template <typename... Cs>
20582063
void doBindInternalIndicesExplicit(framework::pack<Cs...>, o2::soa::Binding binding)
20592064
{
2060-
([this, &binding](){ if constexpr (is_self_index_column<Cs>) { static_cast<Cs>(mBegin).setCurrentRaw(binding); } }(), ...);
2065+
([this, &binding]() { if constexpr (is_self_index_column<Cs>) { static_cast<Cs>(mBegin).setCurrentRaw(binding); } }(), ...);
20612066
}
20622067

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