Merge pull request #1458 from dtolnay/feature

dtolnay · web-flow · commit 82765ef1cdcc · 2025-03-04T13:42:03.000-05:00
Switch to standard feature-test macros
diff --git a/include/cxx.h b/include/cxx.h
@@ -48,7 +48,7 @@ class String final {
   String(const char *, std::size_t);
   String(const char16_t *);
   String(const char16_t *, std::size_t);
-#if __cplusplus >= 202002L
+#ifdef __cpp_char8_t
   String(const char8_t *s);
   String(const char8_t *s, std::size_t len);
 #endif
diff --git a/src/cxx.cc b/src/cxx.cc
@@ -130,7 +130,7 @@ String::String(const char *s, std::size_t len) {
              len);
 }
 
-#if __cplusplus >= 202002L
+#ifdef __cpp_char8_t
 String::String(const char8_t *s) : String(reinterpret_cast<const char *>(s)) {}
 
 String::String(const char8_t *s, std::size_t len)

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ String::String(const char *s, std::size_t len) {`
`130`	`130`	`len);`
`131`	`131`	`}`
`132`	`132`
`133`		`-#if __cplusplus >= 202002L`
	`133`	`+#ifdef __cpp_char8_t`
`134`	`134`	`String::String(const char8_t s) : String(reinterpret_cast<const char >(s)) {}`
`135`	`135`
`136`	`136`	`String::String(const char8_t *s, std::size_t len)`