Skip to content

Commit 0c608cf

Browse files
committed
fixup! DPL Analysis: fix for iterator not setting the originals correctly
1 parent 89799fa commit 0c608cf

File tree

1 file changed

+3
-11
lines changed
  • Framework/Core/include/Framework

1 file changed

+3
-11
lines changed

Framework/Core/include/Framework/ASoA.h

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,12 +1451,7 @@ using PresliceOptional = PresliceBase<T, true, true>;
14511451

14521452
namespace o2::soa
14531453
{
1454-
template <typename T>
1455-
class FilteredBase;
1456-
template <typename T>
1457-
class Filtered;
1458-
1459-
template <typename T>
1454+
template <soa::is_table T>
14601455
class FilteredBase;
14611456
template <typename T>
14621457
class Filtered;
@@ -3062,9 +3057,6 @@ consteval auto getIndexTargets()
30623057

30633058
namespace o2::soa
30643059
{
3065-
// template <typename T>
3066-
// class FilteredBase;
3067-
30683060
template <typename D, typename... Ts>
30693061
struct JoinFull : Table<o2::aod::Hash<"JOIN"_h>, D, o2::aod::Hash<"JOIN"_h>, Ts...> {
30703062
using base = Table<o2::aod::Hash<"JOIN"_h>, D, o2::aod::Hash<"JOIN"_h>, Ts...>;
@@ -3202,7 +3194,7 @@ constexpr auto concat(Ts const&... t)
32023194
return Concat<Ts...>{t...};
32033195
}
32043196

3205-
template <typename T>
3197+
template <soa::is_table T>
32063198
class FilteredBase : public T
32073199
{
32083200
public:
@@ -3472,7 +3464,7 @@ template <typename T>
34723464
class Filtered : public FilteredBase<T>
34733465
{
34743466
public:
3475-
using base_t = FilteredBase<T>;
3467+
using base_t = T;
34763468
using self_t = Filtered<T>;
34773469
using table_t = typename T::table_t;
34783470
using columns_t = typename T::columns_t;

0 commit comments

Comments
 (0)