From 2c0dda20d0eff2305a3598902963a9cde6cca6e3 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Sat, 22 Mar 2025 11:58:28 +0100
Subject: [PATCH 1/2] Fix mdspan converting constructor
---
dune/common/std/mdspan.hh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dune/common/std/mdspan.hh b/dune/common/std/mdspan.hh
index 30394cf44..1c65e26bc 100644
--- a/dune/common/std/mdspan.hh
+++ b/dune/common/std/mdspan.hh
@@ -168,10 +168,10 @@ public:
/// \brief Converting constructor
template <class OtherElementType, class OtherExtends, class OtherLayoutPolicy, class OtherAccessor,
- std::enable_if_t<std::is_constructible_v<mapping_type, const typename OtherElementType::template mapping<OtherExtends>&>, int> = 0,
+ std::enable_if_t<std::is_constructible_v<mapping_type, const typename OtherLayoutPolicy::template mapping<OtherExtends>&>, int> = 0,
std::enable_if_t<std::is_constructible_v<accessor_type, const OtherAccessor&>, int> = 0>
#if __cpp_conditional_explicit >= 201806L
- explicit(!std::is_convertible_v<const typename OtherElementType::template mapping<OtherExtends>&, mapping_type>
+ explicit(!std::is_convertible_v<const typename OtherLayoutPolicy::template mapping<OtherExtends>&, mapping_type>
|| !std::is_convertible_v<const OtherAccessor&, accessor_type>)
#endif
constexpr mdspan (const mdspan<OtherElementType,OtherExtends,OtherLayoutPolicy,OtherAccessor>& other) noexcept
--
GitLab
From 7c72f546c42ade4de03d886f297988bc2ac24461 Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Sat, 22 Mar 2025 12:02:09 +0100
Subject: [PATCH 2/2] Add test for the converting constructor
---
dune/common/std/test/mdspantest.cc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dune/common/std/test/mdspantest.cc b/dune/common/std/test/mdspantest.cc
index c07ca2612..d4e7e332b 100644
--- a/dune/common/std/test/mdspantest.cc
+++ b/dune/common/std/test/mdspantest.cc
@@ -83,6 +83,11 @@ void test_accessor (Dune::TestSuite& testSuite, std::string name, const M& mappi
else if constexpr(Span::rank() == 3)
Span span5{dh, e.extent(0), e.extent(1), e.extent(2)};
+ // converting constructor
+ using OtherExtents = Dune::Std::dextents<std::size_t, Span::rank()>;
+ using OtherSpan = Dune::Std::mdspan<typename A::element_type, OtherExtents, typename M::layout_type, A>;
+ OtherSpan otherSpan(span4);
+
checkAccess(subTestSuite, span2);
testSuite.subTest(subTestSuite);
}
--
GitLab