Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 93f4a93e12
Branches Tags
electron
/
patches
/
node
/
chore_disable_deprecation_ftbfs_in_simdjson_header.patch

chore_disable_deprecation_ftbfs_in_simdjson_header.patch 2.2 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Charles Kerr <[email protected]>
    3. 

  3. Date: Mon, 4 Nov 2024 17:40:17 -0600
    4. 

  4. Subject: chore: disable deprecation ftbfs in simdjson header
    5. 

  5. 

  6. Without this patch, building with simdjson fails with
    7. 

  7. 

  8. > error: identifier '_padded' preceded by whitespace in a literal operator
    9. 

  9. > declaration is deprecated [-Werror,-Wdeprecated-literal-operator]
    10. 

  10. 

  11. This patch can be removed once this is fixed upstream in simdjson.
    12. 

  12. 

  13. diff --git a/deps/simdjson/simdjson.h b/deps/simdjson/simdjson.h
    14. 

  14. index f21cd9381eef59ec43502c796fcaddb1b96525f5..e691fd24aa24d225f8c00fa5638be07265bfeeab 100644
    15. 

  15. --- a/deps/simdjson/simdjson.h
    16. 

  16. +++ b/deps/simdjson/simdjson.h
    17. 

  17. @@ -3654,12 +3654,17 @@ inline std::ostream& operator<<(std::ostream& out, simdjson_result<padded_string
    18. 

  18.  
    19. 

  19.  } // namespace simdjson
    20. 

  20.  
    21. 

  21. +#pragma clang diagnostic push
    22. 

  22. +#pragma clang diagnostic ignored "-Wdeprecated-literal-operator"
    23. 

  23. +
    24. 

  24.  // This is deliberately outside of simdjson so that people get it without having to use the namespace
    25. 

  25.  inline simdjson::padded_string operator "" _padded(const char *str, size_t len);
    26. 

  26.  #ifdef __cpp_char8_t
    27. 

  27.  inline simdjson::padded_string operator "" _padded(const char8_t *str, size_t len);
    28. 

  28.  #endif
    29. 

  29.  
    30. 

  30. +#pragma clang diagnostic pop
    31. 

  31. +
    32. 

  32.  namespace simdjson {
    33. 

  33.  namespace internal {
    34. 

  34.  
    35. 

  35. @@ -4037,6 +4042,9 @@ inline simdjson_result<padded_string> padded_string::load(std::string_view filen
    36. 

  36.  
    37. 

  37.  } // namespace simdjson
    38. 

  38.  
    39. 

  39. +#pragma clang diagnostic push
    40. 

  40. +#pragma clang diagnostic ignored "-Wdeprecated-literal-operator"
    41. 

  41. +
    42. 

  42.  inline simdjson::padded_string operator "" _padded(const char *str, size_t len) {
    43. 

  43.    return simdjson::padded_string(str, len);
    44. 

  44.  }
    45. 

  45. @@ -4045,6 +4053,8 @@ inline simdjson::padded_string operator "" _padded(const char8_t *str, size_t le
    46. 

  46.    return simdjson::padded_string(reinterpret_cast<const char8_t *>(str), len);
    47. 

  47.  }
    48. 

  48.  #endif
    49. 

  49. +#pragma clang diagnostic pop
    50. 

  50. +
    51. 

  51.  #endif // SIMDJSON_PADDED_STRING_INL_H
    52. 

  52.  /* end file simdjson/padded_string-inl.h */
    53. 

  53.  /* skipped duplicate #include "simdjson/padded_string_view.h" */
    54. 

  54. @@ -118292,4 +118302,4 @@ namespace simdjson {
    55. 

  55.  /* end file simdjson/ondemand.h */
    56. 

  56.  
    57. 

  57.  #endif // SIMDJSON_H
    58. 

  58. -/* end file simdjson.h */
    59. 

  59. +/* end file simdjson.h */
    60. 

  60. \ No newline at end of file
    61.