From 230099454fd46332a6d3b09044f85744c50b9bc8 Mon Sep 17 00:00:00 2001 From: Christian Trott Date: Thu, 4 Jan 2024 12:20:03 -0700 Subject: [PATCH 1/2] Fix mistake in layout_stride affecting MSVC --- include/experimental/__p0009_bits/layout_stride.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/experimental/__p0009_bits/layout_stride.hpp b/include/experimental/__p0009_bits/layout_stride.hpp index ffb8054a..b42d2703 100644 --- a/include/experimental/__p0009_bits/layout_stride.hpp +++ b/include/experimental/__p0009_bits/layout_stride.hpp @@ -88,7 +88,7 @@ struct layout_stride { : private detail::__no_unique_address_emulation< detail::__compressed_pair< Extents, - std::array + detail::possibly_empty_array > > #endif From 10cea0e1bfac3f82f2691587e84eb75c585b8c1b Mon Sep 17 00:00:00 2001 From: Christian Trott Date: Thu, 4 Jan 2024 12:20:54 -0700 Subject: [PATCH 2/2] MSVC now supports conditional explicit --- include/experimental/__p0009_bits/config.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/experimental/__p0009_bits/config.hpp b/include/experimental/__p0009_bits/config.hpp index 7d66abaa..8e42a37b 100644 --- a/include/experimental/__p0009_bits/config.hpp +++ b/include/experimental/__p0009_bits/config.hpp @@ -231,7 +231,7 @@ static_assert(_MDSPAN_CPLUSPLUS >= MDSPAN_CXX_STD_14, "mdspan requires C++14 or #endif #ifndef MDSPAN_CONDITIONAL_EXPLICIT -# if MDSPAN_HAS_CXX_20 && !defined(_MDSPAN_COMPILER_MSVC) +# if MDSPAN_HAS_CXX_20 # define MDSPAN_CONDITIONAL_EXPLICIT(COND) explicit(COND) # else # define MDSPAN_CONDITIONAL_EXPLICIT(COND)