diff --git a/test/common/concepts_common.h b/test/common/concepts_common.h index c3781270d4e..0ca66048a92 100644 --- a/test/common/concepts_common.h +++ b/test/common/concepts_common.h @@ -256,6 +256,11 @@ namespace parallel_sort_value { using NonMoveAssignableValue = ParallelSortValue; using NonComparableValue = ParallelSortValue; } // namespace parallel_sort_value +template +class ConstantIT { + T data{}; + const T& operator* () const { return data; } +}; namespace container_based_sequence { template @@ -272,12 +277,6 @@ using NoEnd = ContainerBasedSequence; template using CustomValueCBS = ContainerBasedSequence; -template -class ConstantIT { - T data{}; - const T& operator* () const { return data; } -}; - struct ConstantCBS { ConstantIT begin() const { return ConstantIT{}; } ConstantIT end() const { return ConstantIT{}; } diff --git a/test/tbb/test_parallel_sort.cpp b/test/tbb/test_parallel_sort.cpp index d4428f12ded..132792488a0 100644 --- a/test/tbb/test_parallel_sort.cpp +++ b/test/tbb/test_parallel_sort.cpp @@ -238,10 +238,10 @@ void test_psort_iterator_constraints() { static_assert(can_call_parallel_sort_with_iterator::iterator>); static_assert(!can_call_parallel_sort_with_iterator>); static_assert(!can_call_parallel_sort_with_iterator>); - static_assert(!can_call_parallel_sort_with_iterator>); static_assert(!can_call_parallel_sort_with_iterator>); static_assert(!can_call_parallel_sort_with_iterator>); static_assert(!can_call_parallel_sort_with_iterator>); + static_assert(!can_call_parallel_sort_with_iterator>); static_assert(can_call_parallel_sort_with_iterator_and_compare, CorrectCompare>); static_assert(can_call_parallel_sort_with_iterator_and_compare::iterator, CorrectCompare>);