minor rebase fixes

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -394,7 +394,7 @@ concept has_metadata = is_metadata_trait<T> && not_void<typename T::metadata>;
 // concept has_sources = is_metadata<T> && not_void<typename T::sources>;
 
 template <typename T>
-concept is_spawnable_column = std::is_same_v<typename T::spawnable_t, std::true_type>;
+concept is_spawnable_column = std::same_as<typename T::spawnable_t, std::true_type>;
 
 template <typename B, typename E>
 struct EquivalentIndex {

Framework/Core/include/Framework/AnalysisHelpers.h

@@ -84,9 +84,9 @@ class TableConsumer;
 /// a table. The provided template arguments are if type Column and
 /// therefore refer only to the persisted columns.
 template <typename T>
-concept producable = soa::has_metadata<T> || soa::has_metadata<typename T::parent_t>;
+concept is_producable = soa::has_metadata<aod::MetadataTrait<T>> || soa::has_metadata<aod::MetadataTrait<typename T::parent_t>>;
 
-template <producable T>
+template <is_producable T>
 struct WritingCursor {
  public:
   using persistent_table_t = decltype([]() { if constexpr (soa::is_iterator<T>) { return typename T::parent_t{nullptr}; } else { return T{nullptr}; } }());  // std::conditional<soa::is_iterator<T>, typename T::parent_t, T>;
@@ -174,7 +174,7 @@ struct OutputForTable {
 /// given analysis task. Notice how the actual cursor is implemented by the
 /// means of the WritingCursor helper class, from which produces actually
 /// derives.
-template <producable T>
+template <is_producable T>
 struct Produces : WritingCursor<T> {
 };
 
@@ -227,9 +227,9 @@ struct TableTransform {
 /// This helper struct allows you to declare extended tables which should be
 /// created by the task (as opposed to those pre-defined by data model)
 template <typename T>
-concept spawnable = soa::is_table<T> && soa::has_metadata<T>;
+concept is_spawnable = soa::is_table<T> && soa::has_metadata<aod::MetadataTrait<T>>;
 
-template <spawnable T>
+template <is_spawnable T>
 struct Spawns : TableTransform<typename aod::MetadataTrait<o2::aod::Hash<T::ref.desc_hash>>::metadata, T::ref> {
   using metadata = TableTransform<typename aod::MetadataTrait<o2::aod::Hash<T::ref.desc_hash>>::metadata, T::ref>::metadata;
   using extension_t = typename metadata::extension_table_t;

Framework/Core/include/Framework/AnalysisManagers.h

@@ -239,7 +239,7 @@ struct OutputManager {
 };
 
 /// Produces specialization
-template <producable T>
+template <is_producable T>
 struct OutputManager<Produces<T>> {
   static bool appendOutput(std::vector<OutputSpec>& outputs, Produces<T>& /*what*/, uint32_t)
   {
@@ -339,7 +339,7 @@ static inline auto extractOriginals(ProcessingContext& pc)
   }(std::make_index_sequence<refs.size()>());
 }
 
-template <typename T>
+template <is_spawnable T>
 struct OutputManager<Spawns<T>> {
   static bool appendOutput(std::vector<OutputSpec>& outputs, Spawns<T>& what, uint32_t)
   {