Addressed comment #83541 (comment)

H-G-Hristov · H-G-Hristov · commit cf875450cc4b · 2025-10-21T19:35:45.000+03:00
diff --git a/libcxx/test/std/input.output/span.streams/helper_types.h b/libcxx/test/std/input.output/span.streams/helper_types.h
@@ -124,10 +124,6 @@ static_assert(!std::constructible_from<std::span<const wchar_t>, const NonReadOn
 static_assert(!std::convertible_to<const NonReadOnlySpan<wchar_t>, std::span<const wchar_t>>);
 #endif
 
-// Mode types
-
-struct NonMode {};
-
 // Spanbuffer wrapper
 
 template <typename CharT, typename TraitsT>
diff --git a/libcxx/test/std/input.output/span.streams/ispanstream/ispanstream.cons/ctor.span.mode.pass.cpp b/libcxx/test/std/input.output/span.streams/ispanstream/ispanstream.cons/ctor.span.mode.pass.cpp
@@ -42,6 +42,7 @@ void test_sfinae() {
   static_assert(!test_convertible<SpStream, const std::span<CharT>, std::ios_base::openmode>());
 
   // Non-mode
+  struct NonMode {};
   static_assert(!std::constructible_from<SpStream, const std::span<CharT>, const NonMode>);
   static_assert(!test_convertible<SpStream, const std::span<CharT>, const NonMode>());
 }
diff --git a/libcxx/test/std/input.output/span.streams/ospanstream/ospanstream.cons/ctor.span.mode.pass.cpp b/libcxx/test/std/input.output/span.streams/ospanstream/ospanstream.cons/ctor.span.mode.pass.cpp
@@ -40,6 +40,7 @@ void test_sfinae() {
   static_assert(!test_convertible<SpStream, const std::span<CharT>, std::ios_base::openmode>());
 
   // Non-mode
+  struct NonMode {};
   static_assert(!std::constructible_from<SpStream, const std::span<CharT>, const NonMode>);
   static_assert(!test_convertible<SpStream, const std::span<CharT>, const NonMode>());
 }
diff --git a/libcxx/test/std/input.output/span.streams/spanbuf/spanbuf.cons/mode.pass.cpp b/libcxx/test/std/input.output/span.streams/spanbuf/spanbuf.cons/mode.pass.cpp
@@ -39,6 +39,7 @@ void test_sfinae() {
   static_assert(!test_convertible<SpanBuf, std::ios_base::openmode>());
 
   // Non-mode
+  struct NonMode {};
   static_assert(!std::constructible_from<SpanBuf, const NonMode>);
   static_assert(!test_convertible<SpanBuf, const NonMode>());
 }
diff --git a/libcxx/test/std/input.output/span.streams/spanbuf/spanbuf.cons/span.mode.pass.cpp b/libcxx/test/std/input.output/span.streams/spanbuf/spanbuf.cons/span.mode.pass.cpp
@@ -41,6 +41,7 @@ void test_sfinae() {
   static_assert(!test_convertible<SpanBuf, const std::span<CharT>, std::ios_base::openmode>());
 
   // Non-mode
+  struct NonMode {};
   static_assert(!std::constructible_from<SpanBuf, const std::span<CharT>, const NonMode>);
   static_assert(!test_convertible<SpanBuf, const std::span<CharT>, const NonMode>());
 }
diff --git a/libcxx/test/std/input.output/span.streams/spanstream/spanstream.cons/ctor.span.mode.pass.cpp b/libcxx/test/std/input.output/span.streams/spanstream/spanstream.cons/ctor.span.mode.pass.cpp
@@ -39,6 +39,7 @@ void test_sfinae() {
   static_assert(!test_convertible<SpStream, const std::span<CharT>, std::ios_base::openmode>());
 
   // Non-mode
+  struct NonMode {};
   static_assert(!std::constructible_from<SpStream, const std::span<CharT>, const NonMode>);
   static_assert(!test_convertible<SpStream, const std::span<CharT>, const NonMode>());
 }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ void test_sfinae() {`
`42`	`42`	`static_assert(!test_convertible<SpStream, const std::span<CharT>, std::ios_base::openmode>());`
`43`	`43`
`44`	`44`	`// Non-mode`
	`45`	`+ struct NonMode {};`
`45`	`46`	`static_assert(!std::constructible_from<SpStream, const std::span<CharT>, const NonMode>);`
`46`	`47`	`static_assert(!test_convertible<SpStream, const std::span<CharT>, const NonMode>());`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ void test_sfinae() {`
`40`	`40`	`static_assert(!test_convertible<SpStream, const std::span<CharT>, std::ios_base::openmode>());`
`41`	`41`
`42`	`42`	`// Non-mode`
	`43`	`+ struct NonMode {};`
`43`	`44`	`static_assert(!std::constructible_from<SpStream, const std::span<CharT>, const NonMode>);`
`44`	`45`	`static_assert(!test_convertible<SpStream, const std::span<CharT>, const NonMode>());`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ void test_sfinae() {`
`39`	`39`	`static_assert(!test_convertible<SpanBuf, std::ios_base::openmode>());`
`40`	`40`
`41`	`41`	`// Non-mode`
	`42`	`+ struct NonMode {};`
`42`	`43`	`static_assert(!std::constructible_from<SpanBuf, const NonMode>);`
`43`	`44`	`static_assert(!test_convertible<SpanBuf, const NonMode>());`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ void test_sfinae() {`
`41`	`41`	`static_assert(!test_convertible<SpanBuf, const std::span<CharT>, std::ios_base::openmode>());`
`42`	`42`
`43`	`43`	`// Non-mode`
	`44`	`+ struct NonMode {};`
`44`	`45`	`static_assert(!std::constructible_from<SpanBuf, const std::span<CharT>, const NonMode>);`
`45`	`46`	`static_assert(!test_convertible<SpanBuf, const std::span<CharT>, const NonMode>());`
`46`	`47`	`}`