Skip to content

Commit f6a7fe4

Browse files
committed
remove obsolete concept
1 parent 611600b commit f6a7fe4

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
@@ -806,9 +806,6 @@ concept is_dynamic_column = requires(C& c) {
806806
template <typename C>
807807
concept is_marker_column = requires { &C::mark; };
808808

809-
template <typename T>
810-
using is_dynamic_t = std::conditional_t<is_dynamic_column<T>, std::true_type, std::false_type>;
811-
812809
template <typename T>
813810
concept is_column = is_persistent_column<T> || is_dynamic_column<T> || is_indexing_column<T> || is_marker_column<T>;
814811

@@ -1838,20 +1835,17 @@ class Table
18381835
}
18391836
}
18401837

1841-
template <typename CD, typename... CDArgs>
1838+
template <soa::is_dynamic_column CD, typename... CDArgs>
18421839
auto getDynamicColumn() const
18431840
{
1844-
using decayed = std::decay_t<CD>;
1845-
static_assert(is_dynamic_t<decayed>(), "Requested column is not a dynamic column");
1846-
return static_cast<decayed>(*this).template getDynamicValue<CDArgs...>();
1841+
return static_cast<std::decay_t<CD>>(*this).template getDynamicValue<CDArgs...>();
18471842
}
18481843

18491844
template <typename B, typename CC>
1845+
requires(is_dynamic_column<CC> || is_persistent_column<CC>)
18501846
auto getValue() const
18511847
{
1852-
using COL = std::decay_t<CC>;
1853-
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");
1854-
return static_cast<B>(static_cast<COL>(*this).get());
1848+
return static_cast<B>(static_cast<std::decay_t<CC>>(*this).get());
18551849
}
18561850

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

0 commit comments

Comments
 (0)