Skip to content

Commit d3762a4

Browse files
authored
Merge pull request #84 from alibuild/alibot-cleanup-13947
2 parents 5eed79c + f271c3a commit d3762a4

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed

Framework/Core/include/Framework/AnalysisHelpers.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ struct Produces : WritingCursor<T> {
191191
};
192192

193193
template <typename T>
194-
concept is_produces = requires (T t) { typename T::cursor_t; typename T::persistent_table_t; &T::cursor; };
194+
concept is_produces = requires(T t) { typename T::cursor_t; typename T::persistent_table_t; &T::cursor; };
195195

196196
/// Use this to group together produces. Useful to separate them logically
197197
/// or simply to stay within the 100 elements per Task limit.
@@ -572,7 +572,7 @@ struct OutputObj {
572572
};
573573

574574
template <typename T>
575-
concept is_outputobj = requires (T t) { &T::setObject; std::same_as<decltype(t.object), std::shared_ptr<typename T::obj_t>>; };
575+
concept is_outputobj = requires(T t) { &T::setObject; std::same_as<decltype(t.object), std::shared_ptr<typename T::obj_t>>; };
576576

577577
/// This helper allows you to fetch a Sevice from the context or
578578
/// by using some singleton. This hopefully will hide the Singleton and
@@ -593,7 +593,7 @@ struct Service {
593593
};
594594

595595
template <typename T>
596-
concept is_service = requires (T t) { std::same_as<decltype(t.service), typename T::service_t*>; &T::operator->;};
596+
concept is_service = requires(T t) { std::same_as<decltype(t.service), typename T::service_t*>; &T::operator->; };
597597

598598
auto getTableFromFilter(soa::is_filtered_table auto const& table, soa::SelectionVector&& selection)
599599
{
@@ -721,7 +721,7 @@ struct Partition {
721721
};
722722

723723
template <typename T>
724-
concept is_partition = requires (T t) {&T::updatePlaceholders; std::same_as<decltype(t.filter), expressions::Filter>; std::same_as<decltype(t.mFiltered), std::unique_ptr<o2::soa::Filtered<typename T::content_t>>>;};
724+
concept is_partition = requires(T t) {&T::updatePlaceholders; std::same_as<decltype(t.filter), expressions::Filter>; std::same_as<decltype(t.mFiltered), std::unique_ptr<o2::soa::Filtered<typename T::content_t>>>; };
725725
} // namespace o2::framework
726726

727727
namespace o2::soa

Framework/Core/include/Framework/AnalysisManagers.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
namespace o2::framework
3232
{
3333

34-
namespace {
34+
namespace
35+
{
3536
template <typename O>
3637
static inline auto extractOriginal(ProcessingContext& pc)
3738
{
@@ -51,9 +52,10 @@ static inline auto extractOriginals(ProcessingContext& pc)
5152
return {pc.inputs().get<TableConsumer>(o2::aod::label<refs[Is]>())->asArrowTable()...};
5253
}(std::make_index_sequence<refs.size()>());
5354
}
54-
}
55+
} // namespace
5556

56-
namespace analysis_task_parsers {
57+
namespace analysis_task_parsers
58+
{
5759

5860
/// Options handling
5961
template <typename O>
@@ -442,7 +444,7 @@ void setPartition(P&, T&...)
442444
template <is_partition P, typename... T>
443445
void setPartition(P& partition, T&... tables)
444446
{
445-
([&](){ if constexpr (std::same_as<typename P::content_t, T>) {partition.bindTable(tables);} }(), ...);
447+
([&]() { if constexpr (std::same_as<typename P::content_t, T>) {partition.bindTable(tables);} }(), ...);
446448
}
447449

448450
template <typename P, typename T>
@@ -507,7 +509,7 @@ static void setGroupedCombination(C& comb, TG& grouping, std::tuple<Ts...>& asso
507509
}
508510
}
509511

510-
} // analysis_task_parsers
512+
} // namespace analysis_task_parsers
511513

512514
template <typename ANY>
513515
struct UpdateProcessSwitches {

Framework/Core/include/Framework/AnalysisTask.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args)
580580
homogeneous_apply_refs([&eosContext](auto& element) {
581581
analysis_task_parsers::postRunService(eosContext, element);
582582
analysis_task_parsers::postRunOutput(eosContext, element);
583-
return true;},
583+
return true; },
584584
*task.get());
585585
eosContext.services().get<ControlService>().readyToQuit(QuitRequest::Me);
586586
};

Framework/Core/include/Framework/Condition.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct Condition {
4343
};
4444

4545
template <typename T>
46-
concept is_condition = requires (T t) {
46+
concept is_condition = requires(T t) {
4747
typename T::type;
4848
std::same_as<T*, decltype(t.instance)>;
4949
std::same_as<std::string, decltype(t.path)>;

Framework/Core/include/Framework/Configurable.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ concept is_configurable = requires(T& t) { typename T::type; std::same_as<std::s
8989
using ConfigurableAxis = Configurable<std::vector<double>, ConfigParamKind::kAxisSpec, ConfigurablePolicyConst<std::vector<double>, ConfigParamKind::kAxisSpec>>;
9090

9191
template <typename T>
92-
concept is_configurable_axis = is_configurable<T> && requires() {T::kind == ConfigParamKind::kAxisSpec;};
92+
concept is_configurable_axis = is_configurable<T>&&
93+
requires()
94+
{
95+
T::kind == ConfigParamKind::kAxisSpec;
96+
};
9397

9498
template <typename R, typename T, typename... As>
9599
struct ProcessConfigurable : Configurable<bool, ConfigParamKind::kProcessFlag> {

Framework/Core/include/Framework/GroupedCombinations.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ struct GroupedCombinationsGenerator {
241241
};
242242

243243
template <typename T>
244-
concept is_combinations_generator = requires (T t) {
244+
concept is_combinations_generator = requires(T t) {
245245
typename T::GroupedIterator;
246246
&T::begin;
247247
&T::end;

0 commit comments

Comments
 (0)