Skip to content

Commit e378c4e

Browse files
committed
remove obsolete concept
1 parent 5a2ecfc commit e378c4e

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
@@ -811,9 +811,6 @@ concept is_dynamic_column = requires(C& c) {
811811
template <typename C>
812812
concept is_marker_column = requires { &C::mark; };
813813

814-
template <typename T>
815-
using is_dynamic_t = std::conditional_t<is_dynamic_column<T>, std::true_type, std::false_type>;
816-
817814
template <typename T>
818815
concept is_column = is_persistent_column<T> || is_dynamic_column<T> || is_indexing_column<T> || is_marker_column<T>;
819816

@@ -1828,20 +1825,17 @@ class Table
18281825
}
18291826
}
18301827

1831-
template <typename CD, typename... CDArgs>
1828+
template <soa::is_dynamic_column CD, typename... CDArgs>
18321829
auto getDynamicColumn() const
18331830
{
1834-
using decayed = std::decay_t<CD>;
1835-
static_assert(is_dynamic_t<decayed>(), "Requested column is not a dynamic column");
1836-
return static_cast<decayed>(*this).template getDynamicValue<CDArgs...>();
1831+
return static_cast<std::decay_t<CD>>(*this).template getDynamicValue<CDArgs...>();
18371832
}
18381833

18391834
template <typename B, typename CC>
1835+
requires(is_dynamic_column<CC> || is_persistent_column<CC>)
18401836
auto getValue() const
18411837
{
1842-
using COL = std::decay_t<CC>;
1843-
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");
1844-
return static_cast<B>(static_cast<COL>(*this).get());
1838+
return static_cast<B>(static_cast<std::decay_t<CC>>(*this).get());
18451839
}
18461840

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

0 commit comments

Comments
 (0)