Skip to content

Please consider the following formatting changes to #15337 #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alibuild wants to merge 1 commit into
base: pr15337
Choose a base branch
from
Open

Please consider the following formatting changes to #15337 #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/AnalysisHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ struct Spawns : decltype(transformBase<T>()) {

std::shared_ptr<typename T::table_t> table = nullptr;
std::shared_ptr<extension_t> extension = nullptr;
std::array<o2::framework::expressions::Projector, N> projectors = []<typename... C>(framework::pack<C...>)->std::array<expressions::Projector, sizeof...(C)>
std::array<o2::framework::expressions::Projector, N> projectors = []<typename... C>(framework::pack<C...>) -> std::array<expressions::Projector, sizeof...(C)>
{
return {{std::move(C::Projector())...}};
}
Expand Down
5 changes: 3 additions & 2 deletions Framework/Core/src/ArrowSupport.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,8 +654,9 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec()
effective = opt; // first task Configurable wins
foundFirst = true;
} else if (opt.defaultValue.asString() != effective.defaultValue.asString()) {
LOGP(warn, "Task '{}' declares Configurable '{}' = '{}' which conflicts "
"with an earlier value '{}'; earlier value will be used.",
LOGP(warn,
"Task '{}' declares Configurable '{}' = '{}' which conflicts "
"with an earlier value '{}'; earlier value will be used.",
d.name, opt.name, opt.defaultValue.asString(),
effective.defaultValue.asString());
}
Expand Down