Fixup for LWG4027

Author: frederick-vs-ja

libcxx/test/std/ranges/range.access/cbegin.pass.cpp

@@ -128,13 +128,13 @@ constexpr bool testReturnTypes() {
   ASSERT_SAME_TYPE(decltype(std::ranges::cbegin(a)), int* const*);
   ASSERT_SAME_TYPE(decltype(std::ranges::cbegin(b)), const int(*)[2]);
   ASSERT_SAME_TYPE(decltype(std::ranges::cbegin(c)), const short*);
-  ASSERT_SAME_TYPE(decltype(std::ranges::cbegin(d)), const char*);
+  ASSERT_SAME_TYPE(decltype(std::ranges::cbegin(d)), const short*);
   ASSERT_SAME_TYPE(decltype(std::ranges::cbegin(e)), std::basic_const_iterator<char*>);
 
   ASSERT_SAME_TYPE(decltype(std::ranges::crbegin(a)), std::reverse_iterator<int* const*>);
   ASSERT_SAME_TYPE(decltype(std::ranges::crbegin(b)), std::reverse_iterator<const int(*)[2]>);
   ASSERT_SAME_TYPE(decltype(std::ranges::crbegin(c)), const long*);
-  ASSERT_SAME_TYPE(decltype(std::ranges::crbegin(d)), const int*);
+  ASSERT_SAME_TYPE(decltype(std::ranges::crbegin(d)), const long*);
   ASSERT_SAME_TYPE(decltype(std::ranges::crbegin(e)), std::basic_const_iterator<int*>);
 
   return true;

libcxx/test/std/ranges/range.access/cend.pass.cpp

@@ -128,13 +128,13 @@ constexpr bool testReturnTypes() {
   ASSERT_SAME_TYPE(decltype(std::ranges::cend(a)), int* const*);
   ASSERT_SAME_TYPE(decltype(std::ranges::cend(b)), const int(*)[2]);
   ASSERT_SAME_TYPE(decltype(std::ranges::cend(c)), const short*);
-  ASSERT_SAME_TYPE(decltype(std::ranges::cend(d)), const char*);
+  ASSERT_SAME_TYPE(decltype(std::ranges::cend(d)), const short*);
   ASSERT_SAME_TYPE(decltype(std::ranges::cend(e)), std::basic_const_iterator<char*>);
 
   ASSERT_SAME_TYPE(decltype(std::ranges::crend(a)), std::reverse_iterator<int* const*>);
   ASSERT_SAME_TYPE(decltype(std::ranges::crend(b)), std::reverse_iterator<const int(*)[2]>);
   ASSERT_SAME_TYPE(decltype(std::ranges::crend(c)), const long*);
-  ASSERT_SAME_TYPE(decltype(std::ranges::crend(d)), const int*);
+  ASSERT_SAME_TYPE(decltype(std::ranges::crend(d)), const long*);
   ASSERT_SAME_TYPE(decltype(std::ranges::crend(e)), std::basic_const_iterator<int*>);
 
   return true;

libcxx/test/std/ranges/range.access/data.pass.cpp

@@ -117,7 +117,7 @@ constexpr bool testReturnTypes() {
       int* begin() const;
       int* end() const;
     };
-    ASSERT_SAME_TYPE(decltype(std::ranges::cdata(std::declval<D&>())), const char*);
+    ASSERT_SAME_TYPE(decltype(std::ranges::cdata(std::declval<D&>())), const short*);
     static_assert(!std::is_invocable_v<RangeCDataT, D&&>);
     ASSERT_SAME_TYPE(decltype(std::ranges::cdata(std::declval<const D&>())), const short*);
     static_assert(!std::is_invocable_v<RangeCDataT, const D&&>);
@@ -156,7 +156,7 @@ constexpr bool testReturnTypes() {
     ASSERT_SAME_TYPE(decltype(std::ranges::cdata(std::declval<NC&>())), char*);
     ASSERT_SAME_TYPE(decltype(std::ranges::cdata(std::declval<const NC&>())), char*);
 #else
-    ASSERT_SAME_TYPE(decltype(std::ranges::cdata(std::declval<NC&>())), const int*);
+    ASSERT_SAME_TYPE(decltype(std::ranges::cdata(std::declval<NC&>())), const char*);
     ASSERT_SAME_TYPE(decltype(std::ranges::cdata(std::declval<const NC&>())), const char*);
 #endif
   }

libcxx/test/std/ranges/range.adaptors/range.transform/begin.pass.cpp

@@ -50,7 +50,7 @@ constexpr bool test() {
 
   // LWG4027 ensures that the behavior is unchanged in C++23.
   {
-    [[maybe_unused]] auto r = std::views::single(0) | views::transform([](int) { return 0; });
+    [[maybe_unused]] auto r = std::views::single(0) | std::views::transform([](int) { return 0; });
     using CIt1              = decltype(std::ranges::cbegin(r));
     using CIt2              = decltype(std::cbegin(r));
     static_assert(std::is_same_v<CIt1, CIt2>);