Skip to content

Commit

Permalink
Merge pull request #84 from alibuild/alibot-cleanup-13947
Browse files Browse the repository at this point in the history
  • Loading branch information
aalkin authored Feb 7, 2025
2 parents 5eed79c + f271c3a commit d3762a4
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Framework/Core/include/Framework/AnalysisHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ struct Produces : WritingCursor<T> {
};

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

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

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

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

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

auto getTableFromFilter(soa::is_filtered_table auto const& table, soa::SelectionVector&& selection)
{
Expand Down Expand Up @@ -721,7 +721,7 @@ struct Partition {
};

template <typename T>
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>>>;};
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>>>; };
} // namespace o2::framework

namespace o2::soa
Expand Down
12 changes: 7 additions & 5 deletions Framework/Core/include/Framework/AnalysisManagers.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
namespace o2::framework
{

namespace {
namespace
{
template <typename O>
static inline auto extractOriginal(ProcessingContext& pc)
{
Expand All @@ -51,9 +52,10 @@ static inline auto extractOriginals(ProcessingContext& pc)
return {pc.inputs().get<TableConsumer>(o2::aod::label<refs[Is]>())->asArrowTable()...};
}(std::make_index_sequence<refs.size()>());
}
}
} // namespace

namespace analysis_task_parsers {
namespace analysis_task_parsers
{

/// Options handling
template <typename O>
Expand Down Expand Up @@ -442,7 +444,7 @@ void setPartition(P&, T&...)
template <is_partition P, typename... T>
void setPartition(P& partition, T&... tables)
{
([&](){ if constexpr (std::same_as<typename P::content_t, T>) {partition.bindTable(tables);} }(), ...);
([&]() { if constexpr (std::same_as<typename P::content_t, T>) {partition.bindTable(tables);} }(), ...);
}

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

} // analysis_task_parsers
} // namespace analysis_task_parsers

template <typename ANY>
struct UpdateProcessSwitches {
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/AnalysisTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args)
homogeneous_apply_refs([&eosContext](auto& element) {
analysis_task_parsers::postRunService(eosContext, element);
analysis_task_parsers::postRunOutput(eosContext, element);
return true;},
return true; },
*task.get());
eosContext.services().get<ControlService>().readyToQuit(QuitRequest::Me);
};
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/Condition.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct Condition {
};

template <typename T>
concept is_condition = requires (T t) {
concept is_condition = requires(T t) {
typename T::type;
std::same_as<T*, decltype(t.instance)>;
std::same_as<std::string, decltype(t.path)>;
Expand Down
6 changes: 5 additions & 1 deletion Framework/Core/include/Framework/Configurable.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,11 @@ concept is_configurable = requires(T& t) { typename T::type; std::same_as<std::s
using ConfigurableAxis = Configurable<std::vector<double>, ConfigParamKind::kAxisSpec, ConfigurablePolicyConst<std::vector<double>, ConfigParamKind::kAxisSpec>>;

template <typename T>
concept is_configurable_axis = is_configurable<T> && requires() {T::kind == ConfigParamKind::kAxisSpec;};
concept is_configurable_axis = is_configurable<T>&&
requires()
{
T::kind == ConfigParamKind::kAxisSpec;
};

template <typename R, typename T, typename... As>
struct ProcessConfigurable : Configurable<bool, ConfigParamKind::kProcessFlag> {
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/GroupedCombinations.h
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ struct GroupedCombinationsGenerator {
};

template <typename T>
concept is_combinations_generator = requires (T t) {
concept is_combinations_generator = requires(T t) {
typename T::GroupedIterator;
&T::begin;
&T::end;
Expand Down

0 comments on commit d3762a4

Please sign in to comment.