From 755929a502a7eb347672e7d1e71c65d79e4eead7 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Fri, 21 Feb 2025 09:46:50 +0100 Subject: [PATCH 1/2] DPL Analysis: fix is_preslice concept --- Framework/Core/include/Framework/ASoA.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h index ca9c49e8bc6c8..cb2ff11a8e901 100644 --- a/Framework/Core/include/Framework/ASoA.h +++ b/Framework/Core/include/Framework/ASoA.h @@ -1455,13 +1455,7 @@ template using PresliceOptional = PresliceBase; template -concept is_preslice = requires(T t) { - requires std::same_as; - requires std::same_as; - &T::isMising; - &T::updateSliceInfo; - &T::getSliceFor; -}; +concept is_preslice = std::derived_from; } // namespace o2::framework From 3e3bfdee00aa40a857d6d840c35f555f31671400 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Fri, 21 Feb 2025 09:52:54 +0100 Subject: [PATCH 2/2] fixup! DPL Analysis: fix is_preslice concept --- Framework/Core/include/Framework/AnalysisManagers.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Framework/Core/include/Framework/AnalysisManagers.h b/Framework/Core/include/Framework/AnalysisManagers.h index 1d326e338099f..ccabbd7a0a197 100644 --- a/Framework/Core/include/Framework/AnalysisManagers.h +++ b/Framework/Core/include/Framework/AnalysisManagers.h @@ -511,6 +511,7 @@ static void setGroupedCombination(C& comb, TG& grouping, std::tuple& asso /// Preslice handling template + requires(!is_preslice) bool registerCache(T&, std::vector&, std::vector&) { return false; @@ -549,6 +550,7 @@ bool registerCache(T& preslice, std::vector&, std::vector + requires(!is_preslice) bool updateSliceInfo(T&, ArrowTableSlicingCache&) { return false;