Merge pull request #63 from alibuild/alibot-cleanup-13679

AliceO2Group · Nov 12, 2024 · 65855e6 · 65855e6
2 parents 2f62a21 + df80729
commit 65855e6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h
@@ -39,7 +39,8 @@
 
 #define DECLARE_SOA_ITERATOR_METADATA()                                       \
   template <typename IT>                                                      \
-  requires(o2::soa::is_iterator<IT>) struct MetadataTrait<IT> {               \
+    requires(o2::soa::is_iterator<IT>)                                        \
+  struct MetadataTrait<IT> {                                                  \
     using metadata = typename MetadataTrait<typename IT::parent_t>::metadata; \
   };
 
@@ -1048,11 +1049,15 @@ struct RowViewCore : public IP, C... {
   void bind()
   {
     using namespace o2::soa;
-    auto f = framework::overloaded  {
-      [this]<typename T>(T*) -> void requires is_persistent_column<T> { T::mColumnIterator.mCurrentPos = &this->mRowIndex; },
-      [this]<typename T>(T*) -> void requires is_dynamic_column<T> { bindDynamicColumn<T>(typename T::bindings_t{});},
+    auto f = framework::overloaded{
+      [this]<typename T>(T*) -> void
+        requires is_persistent_column<T>
+                 { T::mColumnIterator.mCurrentPos = &this->mRowIndex; },
+                 [this]<typename T>(T*) -> void
+                   requires is_dynamic_column<T>
+      { bindDynamicColumn<T>(typename T::bindings_t{}); },
       [this]<typename T>(T*) -> void {},
-    };
+      };
     (f(static_cast<C*>(nullptr)), ...);
     if constexpr (has_index_v) {
       this->setIndices(this->getIndices());
@@ -1134,7 +1139,7 @@ template <typename T>
 concept is_index_table = soa::is_specialization_origin_v<T, o2::soa::IndexTable>;
 
 template <soa::is_table T>
-  requires (!soa::is_index_table<T>)
+  requires(!soa::is_index_table<T>)
 static constexpr std::string getLabelFromType()
 {
   if constexpr (soa::is_type_with_originals_v<std::decay_t<T>>) {

diff --git a/Framework/Core/include/Framework/AnalysisHelpers.h b/Framework/Core/include/Framework/AnalysisHelpers.h
@@ -87,7 +87,7 @@ struct WritingCursor<soa::Table<ORIGIN, PC...>> {
   template <typename T>
   static decltype(auto) extract(T const& arg)
   {
-    if constexpr (requires (T t) { t.globalIndex(); }) {
+    if constexpr (requires(T t) { t.globalIndex(); }) {
       return arg.globalIndex();
     } else {
       static_assert(!framework::has_type<T>(framework::pack<PC...>{}), "Argument type mismatch");

diff --git a/Framework/Core/include/Framework/AnalysisTask.h b/Framework/Core/include/Framework/AnalysisTask.h
@@ -126,7 +126,8 @@ struct AnalysisDataProcessorBuilder {
   }
 
   template <typename O>
-  static void addOriginal(const char* name, bool value, std::vector<InputSpec>& inputs) requires soa::has_metadata<aod::MetadataTrait<std::decay_t<O>>>
+  static void addOriginal(const char* name, bool value, std::vector<InputSpec>& inputs)
+    requires soa::has_metadata<aod::MetadataTrait<std::decay_t<O>>>
   {
     using metadata = typename aod::MetadataTrait<std::decay_t<O>>::metadata;
     std::vector<ConfigParamSpec> inputMetadata;
@@ -176,7 +177,8 @@ struct AnalysisDataProcessorBuilder {
   }
 
   template <typename T>
-  static auto extractTableFromRecord(InputRecord& record) requires soa::has_metadata<aod::MetadataTrait<T>>
+  static auto extractTableFromRecord(InputRecord& record)
+    requires soa::has_metadata<aod::MetadataTrait<T>>
   {
     auto table = record.get<TableConsumer>(aod::MetadataTrait<T>::metadata::tableLabel())->asArrowTable();
     if (table->num_rows() == 0) {