|
@@ -0,0 +1,60 @@
|
|
|
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
+From: Charles Kerr <[email protected]>
|
|
|
+Date: Mon, 4 Nov 2024 17:40:17 -0600
|
|
|
+Subject: chore: disable deprecation ftbfs in simdjson header
|
|
|
+
|
|
|
+Without this patch, building with simdjson fails with
|
|
|
+
|
|
|
+> error: identifier '_padded' preceded by whitespace in a literal operator
|
|
|
+> declaration is deprecated [-Werror,-Wdeprecated-literal-operator]
|
|
|
+
|
|
|
+This patch can be removed once this is fixed upstream in simdjson.
|
|
|
+
|
|
|
+diff --git a/deps/simdjson/simdjson.h b/deps/simdjson/simdjson.h
|
|
|
+index ddb6f2e4e0a6edd23d5e16db07bc4bb18974d4aa..533dfea4d5fd3c7f6f7fdf0ea525479b11634fd3 100644
|
|
|
+--- a/deps/simdjson/simdjson.h
|
|
|
++++ b/deps/simdjson/simdjson.h
|
|
|
+@@ -3650,12 +3650,17 @@ inline std::ostream& operator<<(std::ostream& out, simdjson_result<padded_string
|
|
|
+
|
|
|
+ } // namespace simdjson
|
|
|
+
|
|
|
++#pragma clang diagnostic push
|
|
|
++#pragma clang diagnostic ignored "-Wdeprecated-literal-operator"
|
|
|
++
|
|
|
+ // This is deliberately outside of simdjson so that people get it without having to use the namespace
|
|
|
+ inline simdjson::padded_string operator "" _padded(const char *str, size_t len);
|
|
|
+ #ifdef __cpp_char8_t
|
|
|
+ inline simdjson::padded_string operator "" _padded(const char8_t *str, size_t len);
|
|
|
+ #endif
|
|
|
+
|
|
|
++#pragma clang diagnostic pop
|
|
|
++
|
|
|
+ namespace simdjson {
|
|
|
+ namespace internal {
|
|
|
+
|
|
|
+@@ -4033,6 +4038,9 @@ inline simdjson_result<padded_string> padded_string::load(std::string_view filen
|
|
|
+
|
|
|
+ } // namespace simdjson
|
|
|
+
|
|
|
++#pragma clang diagnostic push
|
|
|
++#pragma clang diagnostic ignored "-Wdeprecated-literal-operator"
|
|
|
++
|
|
|
+ inline simdjson::padded_string operator "" _padded(const char *str, size_t len) {
|
|
|
+ return simdjson::padded_string(str, len);
|
|
|
+ }
|
|
|
+@@ -4041,6 +4049,8 @@ inline simdjson::padded_string operator "" _padded(const char8_t *str, size_t le
|
|
|
+ return simdjson::padded_string(reinterpret_cast<const char8_t *>(str), len);
|
|
|
+ }
|
|
|
+ #endif
|
|
|
++#pragma clang diagnostic pop
|
|
|
++
|
|
|
+ #endif // SIMDJSON_PADDED_STRING_INL_H
|
|
|
+ /* end file simdjson/padded_string-inl.h */
|
|
|
+ /* skipped duplicate #include "simdjson/padded_string_view.h" */
|
|
|
+@@ -118280,4 +118290,4 @@ namespace simdjson {
|
|
|
+ /* end file simdjson/ondemand.h */
|
|
|
+
|
|
|
+ #endif // SIMDJSON_H
|
|
|
+-/* end file simdjson.h */
|
|
|
++/* end file simdjson.h */
|
|
|
+\ No newline at end of file
|