Try to fix tests

Author: H-G-Hristov

libcxx/test/std/ranges/range.adaptors/range.enumerate/iterator/base.pass.cpp

@@ -49,14 +49,14 @@ constexpr void testBase() {
     EnumerateIterator const it                          = view.begin();
     std::same_as<const Iterator&> decltype(auto) result = it.base();
     ASSERT_NOEXCEPT(it.base());
-    assert(base(result) == array.begin());
+    assert(base(result) == std::to_address(base(array.begin())));
   }
 
   // Test the && version
   {
     EnumerateIterator it                         = view.begin();
     std::same_as<Iterator> decltype(auto) result = std::move(it).base();
-    assert(base(result) == array.begin());
+    assert(base(result) == std::to_address(base(array.begin())));
   }
 }
 

libcxx/test/std/ranges/range.adaptors/range.enumerate/iterator/ctor.convert.pass.cpp

@@ -48,7 +48,7 @@ constexpr void test() {
   {
     std::same_as<EnumerateIterator> decltype(auto) it     = view.begin();
     std::same_as<const Iterator&> decltype(auto) itResult = it.base();
-    assert(base(base(itResult)) == array.begin());
+    assert(base(base(itResult)) == std::to_address(base(array.begin())));
 
     auto [index, value] = *(++it);
     assert(index == 1);
@@ -57,7 +57,7 @@ constexpr void test() {
   {
     std::same_as<EnumerateConstIterator> decltype(auto) it = view.begin();
     std::same_as<const Iterator&> decltype(auto) itResult  = it.base();
-    assert(base(base(itResult)) == array.begin());
+    assert(base(base(itResult)) == std::to_address(base(array.begin())));
 
     auto [index, value] = *(++it);
     assert(index == 1);

libcxx/test/std/ranges/range.adaptors/range.enumerate/iterator/iter_move.pass.cpp

@@ -48,20 +48,20 @@ constexpr void test() {
   static_assert(std::is_same_v<decltype(result), std::tuple<typename decltype(it)::difference_type, int&&>&&>);
 
   assert(get<0>(result) == 0);
-  assert(&get<1>(result) == array.begin());
+  assert(&get<1>(result) == std::to_address(base(array.begin())));
 
   static_assert(noexcept(iter_move(it)) == HasNoexceptIterMove);
 }
 
 constexpr bool tests() {
   // clang-format off
-  test<cpp17_input_iterator<int*>,           /* noexcept */ false>();
-  test<cpp20_input_iterator<int*>,           /* noexcept */ false>();
-  test<forward_iterator<int*>,               /* noexcept */ false>();
-  test<bidirectional_iterator<int*>,         /* noexcept */ false>();
-  test<random_access_iterator<int*>,         /* noexcept */ false>();
-  test<contiguous_iterator<int*>,            /* noexcept */ false>();
-  test<int*,                                 /* noexcept */ true>();
+  test<cpp17_input_iterator<int*>,                /* noexcept */ false>();
+  test<cpp20_input_iterator<int*>,                /* noexcept */ false>();
+  test<forward_iterator<int*>,                    /* noexcept */ false>();
+  test<bidirectional_iterator<int*>,              /* noexcept */ false>();
+  test<random_access_iterator<int*>,              /* noexcept */ false>();
+  test<contiguous_iterator<int*>,                 /* noexcept */ false>();
+  test<int*,                                      /* noexcept */ true>();
   test<MaybeNoexceptIterMoveInputIterator<true>,  /* noexcept */ true>();
   test<MaybeNoexceptIterMoveInputIterator<false>, /* noexcept */ false>();
   // clang-format on

libcxx/test/std/ranges/range.adaptors/range.enumerate/sentinel/base.pass.cpp

@@ -41,7 +41,7 @@ constexpr void test() {
 
   EnumerateSentinel const s                    = ev.end();
   std::same_as<Sentinel> decltype(auto) result = s.base();
-  assert(base(base(result)) == array.end());
+  assert(base(base(result)) == std::to_address(base(array.end())));
 }
 
 constexpr bool tests() {

libcxx/test/std/ranges/range.adaptors/range.enumerate/sentinel/ctor.convert.pass.cpp

@@ -54,7 +54,7 @@ constexpr void test() {
   // Test assignment
   EnumerateConstSentinel cs                      = s;
   std::same_as<Sentinel> decltype(auto) csResult = cs.base();
-  assert(base(base(csResult)) == array.end());
+  assert(base(base(csResult)) == std::to_address(base(array.end())));
 }
 
 constexpr bool tests() {