fix for changes in comparison in old compilers, failing in bug introduced lately

hanickadot · hanickadot · commit aa31a2537e65 · 2025-04-11T15:12:53.000+02:00
diff --git a/include/ctre/utf8.hpp b/include/ctre/utf8.hpp
@@ -43,7 +43,7 @@ struct utf8_iterator {
 		friend constexpr auto operator==(self_type, const char8_t * other_ptr) noexcept {
 			return *other_ptr == char8_t{0};
 		}
-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L		
+#if !defined(__cpp_impl_three_way_comparison) || __cpp_impl_three_way_comparison < 201907L		
 		friend constexpr auto operator!=(self_type, const char8_t * other_ptr) noexcept {
 			return *other_ptr != char8_t{0};
 		}
@@ -60,7 +60,7 @@ struct utf8_iterator {
 	
 	const char8_t * ptr{nullptr};
 	const char8_t * end{nullptr};
-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L
+#if !defined(__cpp_impl_three_way_comparison) || __cpp_impl_three_way_comparison < 201907L
 	constexpr friend bool operator!=(const utf8_iterator & lhs, sentinel) {
 		return lhs.ptr < lhs.end;
 	}
@@ -85,7 +85,7 @@ struct utf8_iterator {
 		return lhs.ptr == rhs.ptr;
 	}
 	
-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L
+#if !defined(__cpp_impl_three_way_comparison) || __cpp_impl_three_way_comparison < 201907L
 	constexpr friend bool operator!=(sentinel, const utf8_iterator & rhs) {
 		return rhs.ptr < rhs.end;
 	}
diff --git a/single-header/ctre-unicode.hpp b/single-header/ctre-unicode.hpp
@@ -3136,7 +3136,7 @@ struct utf8_iterator {
 		friend constexpr auto operator==(self_type, const char8_t * other_ptr) noexcept {
 			return *other_ptr == char8_t{0};
 		}
-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L		
+#if !defined(__cpp_impl_three_way_comparison) || __cpp_impl_three_way_comparison < 201907L		
 		friend constexpr auto operator!=(self_type, const char8_t * other_ptr) noexcept {
 			return *other_ptr != char8_t{0};
 		}
@@ -3153,7 +3153,7 @@ struct utf8_iterator {
 	
 	const char8_t * ptr{nullptr};
 	const char8_t * end{nullptr};
-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L
+#if !defined(__cpp_impl_three_way_comparison) || __cpp_impl_three_way_comparison < 201907L
 	constexpr friend bool operator!=(const utf8_iterator & lhs, sentinel) {
 		return lhs.ptr < lhs.end;
 	}
@@ -3178,7 +3178,7 @@ struct utf8_iterator {
 		return lhs.ptr == rhs.ptr;
 	}
 	
-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L
+#if !defined(__cpp_impl_three_way_comparison) || __cpp_impl_three_way_comparison < 201907L
 	constexpr friend bool operator!=(sentinel, const utf8_iterator & rhs) {
 		return rhs.ptr < rhs.end;
 	}
diff --git a/single-header/ctre.hpp b/single-header/ctre.hpp
@@ -3133,7 +3133,7 @@ struct utf8_iterator {
 		friend constexpr auto operator==(self_type, const char8_t * other_ptr) noexcept {
 			return *other_ptr == char8_t{0};
 		}
-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L		
+#if !defined(__cpp_impl_three_way_comparison) || __cpp_impl_three_way_comparison < 201907L		
 		friend constexpr auto operator!=(self_type, const char8_t * other_ptr) noexcept {
 			return *other_ptr != char8_t{0};
 		}
@@ -3150,7 +3150,7 @@ struct utf8_iterator {
 	
 	const char8_t * ptr{nullptr};
 	const char8_t * end{nullptr};
-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L
+#if !defined(__cpp_impl_three_way_comparison) || __cpp_impl_three_way_comparison < 201907L
 	constexpr friend bool operator!=(const utf8_iterator & lhs, sentinel) {
 		return lhs.ptr < lhs.end;
 	}
@@ -3175,7 +3175,7 @@ struct utf8_iterator {
 		return lhs.ptr == rhs.ptr;
 	}
 	
-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L
+#if !defined(__cpp_impl_three_way_comparison) || __cpp_impl_three_way_comparison < 201907L
 	constexpr friend bool operator!=(sentinel, const utf8_iterator & rhs) {
 		return rhs.ptr < rhs.end;
 	}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ struct utf8_iterator {`
`43`	`43`	`friend constexpr auto operator==(self_type, const char8_t * other_ptr) noexcept {`
`44`	`44`	`return *other_ptr == char8_t{0};`
`45`	`45`	`}`
`46`		`-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L`
	`46`	`+#if !defined(__cpp_impl_three_way_comparison) \|\| __cpp_impl_three_way_comparison < 201907L`
`47`	`47`	`friend constexpr auto operator!=(self_type, const char8_t * other_ptr) noexcept {`
`48`	`48`	`return *other_ptr != char8_t{0};`
`49`	`49`	`}`
`@@ -60,7 +60,7 @@ struct utf8_iterator {`
`60`	`60`
`61`	`61`	`const char8_t * ptr{nullptr};`
`62`	`62`	`const char8_t * end{nullptr};`
`63`		`-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L`
	`63`	`+#if !defined(__cpp_impl_three_way_comparison) \|\| __cpp_impl_three_way_comparison < 201907L`
`64`	`64`	`constexpr friend bool operator!=(const utf8_iterator & lhs, sentinel) {`
`65`	`65`	`return lhs.ptr < lhs.end;`
`66`	`66`	`}`
`@@ -85,7 +85,7 @@ struct utf8_iterator {`
`85`	`85`	`return lhs.ptr == rhs.ptr;`
`86`	`86`	`}`
`87`	`87`
`88`		`-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L`
	`88`	`+#if !defined(__cpp_impl_three_way_comparison) \|\| __cpp_impl_three_way_comparison < 201907L`
`89`	`89`	`constexpr friend bool operator!=(sentinel, const utf8_iterator & rhs) {`
`90`	`90`	`return rhs.ptr < rhs.end;`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3136,7 +3136,7 @@ struct utf8_iterator {`
`3136`	`3136`	`friend constexpr auto operator==(self_type, const char8_t * other_ptr) noexcept {`
`3137`	`3137`	`return *other_ptr == char8_t{0};`
`3138`	`3138`	`}`
`3139`		`-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L`
	`3139`	`+#if !defined(__cpp_impl_three_way_comparison) \|\| __cpp_impl_three_way_comparison < 201907L`
`3140`	`3140`	`friend constexpr auto operator!=(self_type, const char8_t * other_ptr) noexcept {`
`3141`	`3141`	`return *other_ptr != char8_t{0};`
`3142`	`3142`	`}`
`@@ -3153,7 +3153,7 @@ struct utf8_iterator {`
`3153`	`3153`
`3154`	`3154`	`const char8_t * ptr{nullptr};`
`3155`	`3155`	`const char8_t * end{nullptr};`
`3156`		`-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L`
	`3156`	`+#if !defined(__cpp_impl_three_way_comparison) \|\| __cpp_impl_three_way_comparison < 201907L`
`3157`	`3157`	`constexpr friend bool operator!=(const utf8_iterator & lhs, sentinel) {`
`3158`	`3158`	`return lhs.ptr < lhs.end;`
`3159`	`3159`	`}`
`@@ -3178,7 +3178,7 @@ struct utf8_iterator {`
`3178`	`3178`	`return lhs.ptr == rhs.ptr;`
`3179`	`3179`	`}`
`3180`	`3180`
`3181`		`-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L`
	`3181`	`+#if !defined(__cpp_impl_three_way_comparison) \|\| __cpp_impl_three_way_comparison < 201907L`
`3182`	`3182`	`constexpr friend bool operator!=(sentinel, const utf8_iterator & rhs) {`
`3183`	`3183`	`return rhs.ptr < rhs.end;`
`3184`	`3184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3133,7 +3133,7 @@ struct utf8_iterator {`
`3133`	`3133`	`friend constexpr auto operator==(self_type, const char8_t * other_ptr) noexcept {`
`3134`	`3134`	`return *other_ptr == char8_t{0};`
`3135`	`3135`	`}`
`3136`		`-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L`
	`3136`	`+#if !defined(__cpp_impl_three_way_comparison) \|\| __cpp_impl_three_way_comparison < 201907L`
`3137`	`3137`	`friend constexpr auto operator!=(self_type, const char8_t * other_ptr) noexcept {`
`3138`	`3138`	`return *other_ptr != char8_t{0};`
`3139`	`3139`	`}`
`@@ -3150,7 +3150,7 @@ struct utf8_iterator {`
`3150`	`3150`
`3151`	`3151`	`const char8_t * ptr{nullptr};`
`3152`	`3152`	`const char8_t * end{nullptr};`
`3153`		`-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L`
	`3153`	`+#if !defined(__cpp_impl_three_way_comparison) \|\| __cpp_impl_three_way_comparison < 201907L`
`3154`	`3154`	`constexpr friend bool operator!=(const utf8_iterator & lhs, sentinel) {`
`3155`	`3155`	`return lhs.ptr < lhs.end;`
`3156`	`3156`	`}`
`@@ -3175,7 +3175,7 @@ struct utf8_iterator {`
`3175`	`3175`	`return lhs.ptr == rhs.ptr;`
`3176`	`3176`	`}`
`3177`	`3177`
`3178`		`-#if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison < 201907L`
	`3178`	`+#if !defined(__cpp_impl_three_way_comparison) \|\| __cpp_impl_three_way_comparison < 201907L`
`3179`	`3179`	`constexpr friend bool operator!=(sentinel, const utf8_iterator & rhs) {`
`3180`	`3180`	`return rhs.ptr < rhs.end;`
`3181`	`3181`	`}`