Skip to content

Commit 385cf7d

Browse files
authored
Merge pull request #3 from alibuild/alibot-cleanup-13498
Please consider the following formatting changes to AliceO2Group#13498
2 parents 12b90e0 + 56b5790 commit 385cf7d

1 file changed

Lines changed: 16 additions & 18 deletions

File tree

  • Framework/Core/include/Framework

Framework/Core/include/Framework/ASoA.h

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,17 +2000,15 @@ template <typename R, typename T>
20002000
using ColumnGetterFunction = R (*)(const T&);
20012001

20022002
template <typename T, typename R>
2003-
concept dynamic_with_common_getter = is_dynamic_v<T> &&
2004-
// lambda is callable without additional free args
2005-
framework::pack_size(typename T::bindings_t{}) == framework::pack_size(typename T::callable_t::args{}) &&
2006-
requires (T t)
2007-
{
2008-
{ t.get() } -> std::convertible_to<R>;
2009-
};
2003+
concept dynamic_with_common_getter = is_dynamic_v<T> &&
2004+
// lambda is callable without additional free args
2005+
framework::pack_size(typename T::bindings_t{}) == framework::pack_size(typename T::callable_t::args{}) &&
2006+
requires(T t) {
2007+
{ t.get() } -> std::convertible_to<R>;
2008+
};
20102009

20112010
template <typename T, typename R>
2012-
concept persistent_with_common_getter = is_persistent_v<T> && requires (T t)
2013-
{
2011+
concept persistent_with_common_getter = is_persistent_v<T> && requires(T t) {
20142012
{ t.get() } -> std::convertible_to<R>;
20152013
};
20162014

@@ -2020,21 +2018,21 @@ using with_common_getter_t = typename std::conditional<persistent_with_common_ge
20202018
template <typename R, typename T, persistent_with_common_getter<R> C>
20212019
ColumnGetterFunction<R, T> createGetterPtr(const std::string_view& columnLabel, bool& found)
20222020
{
2023-
if (std::strcmp(columnLabel.data(), C::columnLabel()) == 0) {
2024-
found = true;
2025-
}
2021+
if (std::strcmp(columnLabel.data(), C::columnLabel()) == 0) {
2022+
found = true;
2023+
}
20262024

2027-
return &getColumnValue<R, T, C>;
2025+
return &getColumnValue<R, T, C>;
20282026
}
20292027

20302028
template <typename R, typename T, dynamic_with_common_getter<R> C>
20312029
ColumnGetterFunction<R, T> createGetterPtr(const std::string_view& columnLabel, bool& found)
20322030
{
2033-
if (std::strcmp(&columnLabel[1], C::columnLabel()) == 0 || std::strcmp(columnLabel.data(), C::columnLabel()) == 0) {
2034-
found = true;
2035-
}
2031+
if (std::strcmp(&columnLabel[1], C::columnLabel()) == 0 || std::strcmp(columnLabel.data(), C::columnLabel()) == 0) {
2032+
found = true;
2033+
}
20362034

2037-
return &getColumnValue<R, T, C>;
2035+
return &getColumnValue<R, T, C>;
20382036
}
20392037

20402038
template <typename R, typename T, typename... Cs>
@@ -2801,7 +2799,7 @@ DECLARE_SOA_ITERATOR_METADATA();
28012799
} \
28022800
\
28032801
using bindings_t = typename o2::framework::pack<Bindings...>; \
2804-
using bindings_types_t = typename o2::framework::pack<typename Bindings::type...>; \
2802+
using bindings_types_t = typename o2::framework::pack<typename Bindings::type...>; \
28052803
std::tuple<o2::soa::ColumnIterator<typename Bindings::type> const*...> boundIterators; \
28062804
}
28072805

0 commit comments

Comments
 (0)