Skip to content

Commit 4152761

Browse files
committed
remove obsolete concept
1 parent d89ef68 commit 4152761

File tree

1 file changed

+4
-10
lines changed
  • Framework/Core/include/Framework

1 file changed

+4
-10
lines changed

Framework/Core/include/Framework/ASoA.h

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -814,9 +814,6 @@ concept is_dynamic_column = requires(C& c) {
814814
template <typename C>
815815
concept is_marker_column = requires { &C::mark; };
816816

817-
template <typename T>
818-
using is_dynamic_t = std::conditional_t<is_dynamic_column<T>, std::true_type, std::false_type>;
819-
820817
template <typename T>
821818
concept is_column = is_persistent_column<T> || is_dynamic_column<T> || is_indexing_column<T> || is_marker_column<T>;
822819

@@ -1831,20 +1828,17 @@ class Table
18311828
}
18321829
}
18331830

1834-
template <typename CD, typename... CDArgs>
1831+
template <soa::is_dynamic_column CD, typename... CDArgs>
18351832
auto getDynamicColumn() const
18361833
{
1837-
using decayed = std::decay_t<CD>;
1838-
static_assert(is_dynamic_t<decayed>(), "Requested column is not a dynamic column");
1839-
return static_cast<decayed>(*this).template getDynamicValue<CDArgs...>();
1834+
return static_cast<std::decay_t<CD>>(*this).template getDynamicValue<CDArgs...>();
18401835
}
18411836

18421837
template <typename B, typename CC>
1838+
requires(is_dynamic_column<CC> || is_persistent_column<CC>)
18431839
auto getValue() const
18441840
{
1845-
using COL = std::decay_t<CC>;
1846-
static_assert(is_dynamic_t<COL>() || soa::is_persistent_column<COL>, "Should be persistent or dynamic column with no argument that has a return type convertable to float");
1847-
return static_cast<B>(static_cast<COL>(*this).get());
1841+
return static_cast<B>(static_cast<std::decay_t<CC>>(*this).get());
18481842
}
18491843

18501844
template <typename B, typename... CCs>

0 commit comments

Comments
 (0)