Skip to content

Commit d67e108

Browse files
committed
traits -> concepts
1 parent 50c3b5a commit d67e108

File tree

1 file changed

+9
-9
lines changed
  • Framework/Core/include/Framework

1 file changed

+9
-9
lines changed

Framework/Core/include/Framework/ASoA.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ struct Binding {
381381
{
382382
ptr = table;
383383
hash = o2::framework::TypeIdHelpers::uniqueId<T>();
384-
if constexpr (framework::is_base_of_template_v<soa::Table, T>) {
384+
if constexpr (framework::base_of_template<soa::Table, T>) {
385385
refs = std::span{T::originals};
386386
}
387387
}
@@ -477,7 +477,7 @@ using unwrap_t = typename unwrap<T>::type;
477477
template <typename T, typename ChunkingPolicy = Chunked>
478478
class ColumnIterator : ChunkingPolicy
479479
{
480-
static constexpr char SCALE_FACTOR = std::is_same_v<std::decay_t<T>, bool> ? 3 : 0;
480+
static constexpr char SCALE_FACTOR = std::same_as<std::decay_t<T>, bool> ? 3 : 0;
481481

482482
public:
483483
/// Constructor of the column iterator. Notice how it takes a pointer
@@ -554,7 +554,7 @@ class ColumnIterator : ChunkingPolicy
554554
decltype(auto) operator*() const
555555
{
556556
if constexpr (ChunkingPolicy::chunked) {
557-
if constexpr (std::is_same_v<arrow_array_for_t<T>, arrow::ListArray>) {
557+
if constexpr (std::same_as<arrow_array_for_t<T>, arrow::ListArray>) {
558558
auto list = std::static_pointer_cast<arrow::ListArray>(mColumn->chunk(mCurrentChunk));
559559
if (O2_BUILTIN_UNLIKELY(*mCurrentPos - mFirstIndex >= list->length())) {
560560
nextChunk();
@@ -565,10 +565,10 @@ class ColumnIterator : ChunkingPolicy
565565
}
566566
}
567567
}
568-
if constexpr (std::is_same_v<bool, std::decay_t<T>>) {
568+
if constexpr (std::same_as<bool, std::decay_t<T>>) {
569569
// FIXME: check if shifting the masked bit to the first position is better than != 0
570570
return (*(mCurrent - (mOffset >> SCALE_FACTOR) + ((*mCurrentPos + mOffset) >> SCALE_FACTOR)) & (1 << ((*mCurrentPos + mOffset) & 0x7))) != 0;
571-
} else if constexpr (std::is_same_v<arrow_array_for_t<T>, arrow::ListArray>) {
571+
} else if constexpr (std::same_as<arrow_array_for_t<T>, arrow::ListArray>) {
572572
auto list = std::static_pointer_cast<arrow::ListArray>(mColumn->chunk(mCurrentChunk));
573573
auto offset = list->value_offset(*mCurrentPos - mFirstIndex);
574574
auto length = list->value_length(*mCurrentPos - mFirstIndex);
@@ -616,10 +616,10 @@ class ColumnIterator : ChunkingPolicy
616616
{
617617
std::shared_ptr<arrow::Array> chunkToUse = mColumn->chunk(mCurrentChunk);
618618
mOffset = chunkToUse->offset();
619-
if constexpr (std::is_same_v<arrow_array_for_t<T>, arrow::FixedSizeListArray>) {
619+
if constexpr (std::same_as<arrow_array_for_t<T>, arrow::FixedSizeListArray>) {
620620
chunkToUse = std::dynamic_pointer_cast<arrow::FixedSizeListArray>(chunkToUse)->values();
621621
return std::static_pointer_cast<arrow_array_for_t<value_for_t<T>>>(chunkToUse);
622-
} else if constexpr (std::is_same_v<arrow_array_for_t<T>, arrow::ListArray>) {
622+
} else if constexpr (std::same_as<arrow_array_for_t<T>, arrow::ListArray>) {
623623
chunkToUse = std::dynamic_pointer_cast<arrow::ListArray>(chunkToUse)->values();
624624
mOffset = chunkToUse->offset();
625625
return std::static_pointer_cast<arrow_array_for_t<value_for_t<T>>>(chunkToUse);
@@ -1055,7 +1055,7 @@ struct TableIterator : IP, C... {
10551055
}
10561056

10571057
TableIterator(TableIterator<D, O, FilteredIndexPolicy, C...> const& other)
1058-
requires std::is_same_v<IP, DefaultIndexPolicy>
1058+
requires std::same_as<IP, DefaultIndexPolicy>
10591059
: IP{static_cast<IP const&>(other)},
10601060
C(static_cast<C const&>(other))...
10611061
{
@@ -1208,7 +1208,7 @@ struct TableIterator : IP, C... {
12081208
requires(can_bind<self_t, B>)
12091209
decltype(auto) getDynamicBinding()
12101210
{
1211-
static_assert(std::is_same_v<decltype(&(static_cast<B*>(this)->mColumnIterator)), std::decay_t<decltype(B::mColumnIterator)>*>, "foo");
1211+
static_assert(std::same_as<decltype(&(static_cast<B*>(this)->mColumnIterator)), std::decay_t<decltype(B::mColumnIterator)>*>, "foo");
12121212
return &(static_cast<B*>(this)->mColumnIterator);
12131213
// return static_cast<std::decay_t<decltype(B::mColumnIterator)>*>(nullptr);
12141214
}

0 commit comments

Comments
 (0)