improve checks

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -139,7 +139,7 @@ template <template <o2::framework::OriginEnc, typename...> class base, typename
 inline constexpr bool is_base_of_template_origin_v = is_base_of_template_origin<base, derived>::value;
 
 template <typename T>
-concept not_void = requires { !std::same_as<T, void>; };
+concept not_void = !std::same_as<T, void>;
 
 // column identification concepts
 template <typename C>
@@ -209,7 +209,7 @@ template <typename T>
 concept has_parent_t = not_void<typename T::parent_t>;
 
 template <typename T>
-concept has_metadata = soa::not_void<typename aod::MetadataTrait<T>::metadata>;
+concept has_metadata = not_void<typename aod::MetadataTrait<T>::metadata>;
 
 template <typename T>
 concept is_spawnable_column = std::is_same_v<typename T::spawnable_t, std::true_type>;

Framework/Core/include/Framework/AnalysisManagers.h

@@ -452,7 +452,7 @@ struct ServiceManager<Service<T>> {
 
   static bool prepare(InitContext& context, Service<T>& service)
   {
-    if constexpr (requires { T::instance(); }) {
+    if constexpr (requires { &T::instance; }) {
       service.service = &(T::instance()); // Sigh...
       return true;
     } else {
@@ -467,7 +467,7 @@ struct ServiceManager<Service<T>> {
   {
     // FIXME: for the moment we only need endOfStream to be
     // stateless. In the future we might want to pass it EndOfStreamContext
-    if constexpr (requires(T t) { t.endOfStream(); }) {
+    if constexpr (requires { &T::endOfStream; }) {
       service.service->endOfStream();
       return true;
     }
@@ -619,7 +619,7 @@ struct IndexManager {
   static bool requestInputs(std::vector<InputSpec>&, T const&) { return false; };
 };
 
-template <typename IDX>
+template <soa::is_index_table IDX>
 struct IndexManager<Builds<IDX>> {
   static bool requestInputs(std::vector<InputSpec>& inputs, Builds<IDX>& builds)
   {