Merge pull request #264 from jcelerier/patch-1

Fix building of utf8.hpp on clang-10 / libstdc++-8

Author: hanickadot

include/ctre/utf8.hpp

@@ -7,6 +7,10 @@
 #include <string_view>
 #include <iterator>
 
+#if __cpp_lib_char8_t >= 201811L
+#define CTRE_ENABLE_UTF8_RANGE
+#endif
+
 namespace ctre {
 
 struct utf8_iterator {
@@ -188,6 +192,7 @@ struct utf8_iterator {
 	}
 };
 
+#ifdef CTRE_ENABLE_UTF8_RANGE
 struct utf8_range {
 	std::u8string_view range;
 	constexpr utf8_range(std::u8string_view r) noexcept: range{r} { }
@@ -199,9 +204,10 @@ struct utf8_range {
 		return utf8_iterator::sentinel{};
 	}
 };
+#endif
 
 }
 
 #endif
 
-#endif
+#endif

include/ctre/wrapper.hpp

@@ -184,7 +184,7 @@ template <typename RE, typename Method, typename Modifier> struct regular_expres
 	static constexpr CTRE_FORCE_INLINE auto exec(std::wstring_view sv) noexcept {
 		return exec(sv.begin(), sv.end());
 	}
-#if __cpp_char8_t >= 201811
+#ifdef CTRE_ENABLE_UTF8_RANGE
 	static constexpr CTRE_FORCE_INLINE auto exec(std::u8string_view sv) noexcept {
 		return exec_with_result_iterator<const char8_t *>(utf8_range(sv).begin(), utf8_range(sv).end());
 	}

single-header/ctre-unicode.hpp

@@ -3031,6 +3031,10 @@ constexpr bool starts_with_anchor(const flags & f, ctll::list<capture_with_name<
 #include <string_view>
 #include <iterator>
 
+#if __cpp_lib_char8_t >= 201811L
+#define CTRE_ENABLE_UTF8_RANGE
+#endif
+
 namespace ctre {
 
 struct utf8_iterator {
@@ -3212,6 +3216,7 @@ struct utf8_iterator {
 	}
 };
 
+#ifdef CTRE_ENABLE_UTF8_RANGE
 struct utf8_range {
 	std::u8string_view range;
 	constexpr utf8_range(std::u8string_view r) noexcept: range{r} { }
@@ -3223,12 +3228,14 @@ struct utf8_range {
 		return utf8_iterator::sentinel{};
 	}
 };
+#endif
 
 }
 
 #endif
 
 #endif
+
 #include <type_traits>
 #include <tuple>
 #include <string_view>
@@ -5377,7 +5384,7 @@ template <typename RE, typename Method, typename Modifier> struct regular_expres
 	static constexpr CTRE_FORCE_INLINE auto exec(std::wstring_view sv) noexcept {
 		return exec(sv.begin(), sv.end());
 	}
-#if __cpp_char8_t >= 201811
+#ifdef CTRE_ENABLE_UTF8_RANGE
 	static constexpr CTRE_FORCE_INLINE auto exec(std::u8string_view sv) noexcept {
 		return exec_with_result_iterator<const char8_t *>(utf8_range(sv).begin(), utf8_range(sv).end());
 	}

single-header/ctre.hpp

@@ -3028,6 +3028,10 @@ constexpr bool starts_with_anchor(const flags & f, ctll::list<capture_with_name<
 #include <string_view>
 #include <iterator>
 
+#if __cpp_lib_char8_t >= 201811L
+#define CTRE_ENABLE_UTF8_RANGE
+#endif
+
 namespace ctre {
 
 struct utf8_iterator {
@@ -3209,6 +3213,7 @@ struct utf8_iterator {
 	}
 };
 
+#ifdef CTRE_ENABLE_UTF8_RANGE
 struct utf8_range {
 	std::u8string_view range;
 	constexpr utf8_range(std::u8string_view r) noexcept: range{r} { }
@@ -3220,12 +3225,14 @@ struct utf8_range {
 		return utf8_iterator::sentinel{};
 	}
 };
+#endif
 
 }
 
 #endif
 
 #endif
+
 #include <type_traits>
 #include <tuple>
 #include <string_view>
@@ -5374,7 +5381,7 @@ template <typename RE, typename Method, typename Modifier> struct regular_expres
 	static constexpr CTRE_FORCE_INLINE auto exec(std::wstring_view sv) noexcept {
 		return exec(sv.begin(), sv.end());
 	}
-#if __cpp_char8_t >= 201811
+#ifdef CTRE_ENABLE_UTF8_RANGE
 	static constexpr CTRE_FORCE_INLINE auto exec(std::u8string_view sv) noexcept {
 		return exec_with_result_iterator<const char8_t *>(utf8_range(sv).begin(), utf8_range(sv).end());
 	}

tests/__utf8.cpp

@@ -1,7 +1,7 @@
 #include <ctre/utf8.hpp>
 #include <algorithm>
 
-#if __cpp_char8_t >= 201811
+#ifdef CTRE_ENABLE_UTF8_RANGE
 
 #define UNICODE_TEST(a) static_assert(call_test(u8 ##a, U ##a))