diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h index f0d29b3e44eb3..ba6d58df9a639 100644 --- a/Framework/Core/include/Framework/ASoA.h +++ b/Framework/Core/include/Framework/ASoA.h @@ -222,8 +222,7 @@ static consteval int getIndexPosToKey_impl() /// Base type for table metadata template struct TableMetadata { - static constexpr void isTableMetadata() - {}; + static constexpr void isTableMetadata() {}; using columns = framework::pack; using persistent_columns_t = framework::selected_pack; using external_index_columns_t = framework::selected_pack; @@ -255,8 +254,7 @@ struct TableMetadata { template struct MetadataTrait { - static constexpr void isMetadataTrait() - {}; + static constexpr void isMetadataTrait() {}; using metadata = void; }; @@ -264,8 +262,7 @@ struct MetadataTrait { /// type signature template struct Hash { - static constexpr void isHash() - {}; + static constexpr void isHash() {}; static constexpr uint32_t hash = H; static constexpr char const* const str{""}; }; @@ -287,8 +284,7 @@ consteval auto filterForKey() #define O2HASH(_Str_) \ template <> \ struct Hash<_Str_ ""_h> { \ - static constexpr void isHash() \ - {}; \ + static constexpr void isHash() {}; \ static constexpr uint32_t hash = _Str_ ""_h; \ static constexpr char const* const str{_Str_}; \ }; @@ -297,10 +293,8 @@ consteval auto filterForKey() #define O2ORIGIN(_Str_) \ template <> \ struct Hash<_Str_ ""_h> { \ - static constexpr void isHash() \ - {}; \ - static constexpr void isOriginHash() \ - {}; \ + static constexpr void isHash() {}; \ + static constexpr void isOriginHash() {}; \ static constexpr header::DataOrigin origin{_Str_}; \ static constexpr uint32_t hash = _Str_ ""_h; \ static constexpr char const* const str{_Str_}; \ @@ -663,8 +657,7 @@ class ColumnIterator : ChunkingPolicy template struct Column { - static constexpr void isIteratableColumn() - {}; + static constexpr void isIteratableColumn() {}; using inherited_t = INHERIT; Column(ColumnIterator const& it) @@ -700,8 +693,7 @@ struct Column { /// method call. template struct DynamicColumn { - static constexpr void isDynamicColumn() - {}; + static constexpr void isDynamicColumn() {}; using inherited_t = INHERIT; static constexpr const char* const& columnLabel() { return INHERIT::mLabel; } @@ -709,8 +701,7 @@ struct DynamicColumn { template struct IndexColumn { - static constexpr void isEnumeratingColumn() - {}; + static constexpr void isEnumeratingColumn() {}; using inherited_t = INHERIT; static constexpr const uint32_t hash = 0; @@ -719,8 +710,7 @@ struct IndexColumn { template struct MarkerColumn { - static constexpr void isMarkingColumn() - {}; + static constexpr void isMarkingColumn() {}; using inherited_t = INHERIT; static constexpr const uint32_t hash = 0; @@ -830,8 +820,7 @@ struct IndexPolicyBase { }; struct RowViewSentinel { - static constexpr void isRowViewSentinel() - {}; + static constexpr void isRowViewSentinel() {}; int64_t const index; }; @@ -942,8 +931,7 @@ struct FilteredIndexPolicy : IndexPolicyBase { }; struct DefaultIndexPolicy : IndexPolicyBase { - static constexpr void isDefaultIndexPolicy() - {}; + static constexpr void isDefaultIndexPolicy() {}; /// Needed to be able to copy the policy DefaultIndexPolicy() = default; DefaultIndexPolicy(DefaultIndexPolicy&&) = default; @@ -1029,8 +1017,7 @@ struct ColumnDataHolder { template struct TableIterator : IP, C... { public: - static constexpr void isTableIterator() - {}; + static constexpr void isTableIterator() {}; using self_t = TableIterator; using policy_t = IP; using all_columns = framework::pack; @@ -1404,8 +1391,7 @@ namespace o2::framework { /// tracks origin in bindingKey matcher to handle the correct arguments struct PreslicePolicyBase { - static constexpr void isPreslicePolicy() - {}; + static constexpr void isPreslicePolicy() {}; const std::string binding; Entry bindingKey; @@ -1434,8 +1420,7 @@ struct PreslicePolicyGeneral : public PreslicePolicyBase { template struct PresliceBase : public Policy { - static constexpr void isPresliceContainer() - {}; + static constexpr void isPresliceContainer() {}; constexpr static bool optional = OPT; using target_t = T; using policy_t = Policy; @@ -1489,8 +1474,7 @@ using PresliceOptional = PresliceBase; /// /// preslices.perCol; struct PresliceGroup { - static constexpr void isPresliceGroup() - {}; + static constexpr void isPresliceGroup() {}; }; } // namespace o2::framework @@ -1716,8 +1700,7 @@ template ; using table_t = self_t; @@ -3329,8 +3312,7 @@ namespace o2::soa { template struct Join : Table, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Ts...> { - static constexpr void isJoin() - {}; + static constexpr void isJoin() {}; using base = Table, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Ts...>; Join(std::shared_ptr&& table, uint64_t offset = 0) @@ -3484,8 +3466,7 @@ template class FilteredBase : public T { public: - static constexpr void isFilteredBase() - {}; + static constexpr void isFilteredBase() {}; using self_t = FilteredBase; using table_t = typename T::table_t; using T::originals; @@ -4097,8 +4078,7 @@ class Filtered> : public FilteredBase /// First index will be used by process() as the grouping template struct IndexTable : Table { - static constexpr void isIndexTable() - {}; + static constexpr void isIndexTable() {}; using self_t = IndexTable; using base_t = Table; using table_t = base_t; @@ -4144,8 +4124,7 @@ struct IndexTable : Table { template struct SmallGroupsBase : public Filtered { - static constexpr void isSmallGroups() - {}; + static constexpr void isSmallGroups() {}; static constexpr bool applyFilters = APPLY; SmallGroupsBase(std::vector>&& tables, gandiva::Selection const& selection, uint64_t offset = 0) : Filtered(std::move(tables), selection, offset) {} diff --git a/Framework/Core/include/Framework/AnalysisHelpers.h b/Framework/Core/include/Framework/AnalysisHelpers.h index 5600e201feb8f..96d89b722780b 100644 --- a/Framework/Core/include/Framework/AnalysisHelpers.h +++ b/Framework/Core/include/Framework/AnalysisHelpers.h @@ -645,8 +645,7 @@ struct Produces : WritingCursor { /// /// Notice the label MySetOfProduces is just a mnemonic and can be omitted. struct ProducesGroup { - static constexpr void isProducesGroup() - {}; + static constexpr void isProducesGroup() {}; }; /// Helper template for table transformations diff --git a/Framework/Core/include/Framework/Concepts.h b/Framework/Core/include/Framework/Concepts.h index e868b439bb286..fea40b25ff1ff 100644 --- a/Framework/Core/include/Framework/Concepts.h +++ b/Framework/Core/include/Framework/Concepts.h @@ -46,18 +46,16 @@ concept is_persistent_column = requires(C c) { c.isIteratableColumn(); }; /// 2. require self-index column template -concept is_self_index_column = requires(C c) -{ +concept is_self_index_column = requires(C c) { typename C::compatible_signature; - //requires aod::is_aod_hash; + // requires aod::is_aod_hash; typename C::self_index_t; requires std::same_as; }; /// 3. require bindable index column template -concept is_index_column = requires(C c) -{ +concept is_index_column = requires(C c) { typename C::binding_t; requires not_void; }; @@ -138,8 +136,7 @@ concept is_table_or_iterator = is_table || is_iterator; /// 10. require soa::IndexTable template -concept is_index_table = requires(T t) -{ +concept is_index_table = requires(T t) { t.isIndexTable(); };