Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/AnalysisSupport/src/AODReaderHelpers.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ struct Spawnable {
iws.str(json);
schemas.emplace_back(ArrowJSONHelpers::read(iws));
}
for (auto const& i : spec.metadata | views::filter_string_params_starts_with("input:") | std::ranges::views::transform([](auto const& param){
for (auto const& i : spec.metadata | views::filter_string_params_starts_with("input:") | std::ranges::views::transform([](auto const& param) {
return DataSpecUtils::fromMetadataString(param.defaultValue.template get<std::string>());
})) {
matchers.emplace_back(std::get<ConcreteDataMatcher>(i.matcher));
Expand Down
6 changes: 5 additions & 1 deletion Framework/Core/include/Framework/ASoA.h
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,11 @@ template <typename T>
using PresliceOptional = PresliceBase<T, PreslicePolicySorted, true>;

template <typename T>
concept is_preslice = std::derived_from<T, PreslicePolicyBase> && requires(T) { T::optional; };
concept is_preslice = std::derived_from<T, PreslicePolicyBase>&&
requires(T)
{
T::optional;
};

/// Can be user to group together a number of Preslice declaration
/// to avoid the limit of 100 data members per task
Expand Down
4 changes: 2 additions & 2 deletions Framework/Core/include/Framework/ConcreteDataMatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ struct ConcreteDataMatcher {
header::DataHeader::SubSpecificationType subSpec;

constexpr ConcreteDataMatcher(header::DataOrigin origin_,
header::DataDescription description_,
header::DataHeader::SubSpecificationType subSpec_)
header::DataDescription description_,
header::DataHeader::SubSpecificationType subSpec_)
: origin(origin_),
description(description_),
subSpec(subSpec_)
Expand Down
4 changes: 2 additions & 2 deletions Framework/Core/src/ArrowTableSlicingCache.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ std::pair<int, bool> ArrowTableSlicingCache::getCachePos(const Entry& bindingKey

int ArrowTableSlicingCache::getCachePosSortedFor(Entry const& bindingKey) const
{
auto locate = std::find(bindingsKeys.begin(), bindingsKeys.end(), bindingKey);//std::find_if(bindingsKeys.begin(), bindingsKeys.end(), [&](Entry const& bk) { return (bindingKey.binding == bk.binding) && (bindingKey.key == bk.key); });
auto locate = std::find(bindingsKeys.begin(), bindingsKeys.end(), bindingKey); // std::find_if(bindingsKeys.begin(), bindingsKeys.end(), [&](Entry const& bk) { return (bindingKey.binding == bk.binding) && (bindingKey.key == bk.key); });
if (locate != bindingsKeys.end()) {
return std::distance(bindingsKeys.begin(), locate);
}
Expand All @@ -219,7 +219,7 @@ int ArrowTableSlicingCache::getCachePosSortedFor(Entry const& bindingKey) const

int ArrowTableSlicingCache::getCachePosUnsortedFor(Entry const& bindingKey) const
{
auto locate_unsorted = std::find(bindingsKeysUnsorted.begin(), bindingsKeysUnsorted.end(), bindingKey);//std::find_if(bindingsKeysUnsorted.begin(), bindingsKeysUnsorted.end(), [&](Entry const& bk) { return (bindingKey.binding == bk.binding) && (bindingKey.key == bk.key); });
auto locate_unsorted = std::find(bindingsKeysUnsorted.begin(), bindingsKeysUnsorted.end(), bindingKey); // std::find_if(bindingsKeysUnsorted.begin(), bindingsKeysUnsorted.end(), [&](Entry const& bk) { return (bindingKey.binding == bk.binding) && (bindingKey.key == bk.key); });
if (locate_unsorted != bindingsKeysUnsorted.end()) {
return std::distance(bindingsKeysUnsorted.begin(), locate_unsorted);
}
Expand Down