Merge pull request #225 from youyu3/fix-197-layout-left-right-inequality

Fix the inequality operator in layout_left and layout_right, after #197
kokkos · Jan 6, 2023 · ad014fa · ad014fa
2 parents 8cad638 + 6b12cf2
commit ad014fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/include/experimental/__p0009_bits/layout_left.hpp b/include/experimental/__p0009_bits/layout_left.hpp
@@ -188,7 +188,7 @@ class layout_left::mapping {
     }
 
     // In C++ 20 the not equal exists if equal is found
-#if MDSPAN_HAS_CXX_20
+#if !(MDSPAN_HAS_CXX_20)
     template<class OtherExtents>
     MDSPAN_INLINE_FUNCTION
     friend constexpr bool operator!=(mapping const& lhs, mapping<OtherExtents> const& rhs) noexcept {

diff --git a/include/experimental/__p0009_bits/layout_right.hpp b/include/experimental/__p0009_bits/layout_right.hpp
@@ -190,7 +190,7 @@ class layout_right::mapping {
     }
 
     // In C++ 20 the not equal exists if equal is found
-#if MDSPAN_HAS_CXX_20
+#if !(MDSPAN_HAS_CXX_20)
     template<class OtherExtents>
     MDSPAN_INLINE_FUNCTION
     friend constexpr bool operator!=(mapping const& lhs, mapping<OtherExtents> const& rhs) noexcept {

diff --git a/tests/test_layout_ctors.cpp b/tests/test_layout_ctors.cpp
@@ -68,6 +68,7 @@ TYPED_TEST(TestLayoutCtors, default_ctor) {
   auto m2 = typename TestFixture::mapping_type{};
   ASSERT_EQ(m2.extents(), typename TestFixture::extents_type{});
   ASSERT_EQ(m, m2);
+  ASSERT_FALSE(m != m2);
 }
 
 template <class> struct TestLayoutCompatCtors;