aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2025-01-07 17:45:06 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2025-01-07 18:03:49 +0300
commit3d58662ce3dcfc068b223c683558840f0a89cace (patch)
tree6e739dc549424295e263e0196d32387eba5cef77
parent5098d8d5e47c4228968a0f28ab95f43cd52abc2e (diff)
downloadydb-3d58662ce3dcfc068b223c683558840f0a89cace.tar.gz
Update contrib/libs/simdjson to 3.11.4
commit_hash:ebd73dfe97389c8337237e458831dd2bbac55160
-rw-r--r--contrib/libs/simdjson/.yandex_meta/override.nix4
-rw-r--r--contrib/libs/simdjson/include/simdjson/compiler_check.h11
-rw-r--r--contrib/libs/simdjson/include/simdjson/portability.h5
-rw-r--r--contrib/libs/simdjson/include/simdjson/simdjson_version.h4
-rw-r--r--contrib/libs/simdjson/ya.make4
5 files changed, 22 insertions, 6 deletions
diff --git a/contrib/libs/simdjson/.yandex_meta/override.nix b/contrib/libs/simdjson/.yandex_meta/override.nix
index be3844a37d..0fac8d7ba0 100644
--- a/contrib/libs/simdjson/.yandex_meta/override.nix
+++ b/contrib/libs/simdjson/.yandex_meta/override.nix
@@ -1,11 +1,11 @@
pkgs: attrs: with pkgs; rec {
- version = "3.11.3";
+ version = "3.11.4";
src = fetchFromGitHub {
owner = "simdjson";
repo = "simdjson";
rev = "v${version}";
- hash = "sha256-Gh9/vOfhEh3RXT4cSb6KpDqjYS0d1kje1JDbDiWTR0o=";
+ hash = "sha256-mcsMp9P9+3ACHkykJitHADoZ35kBeUza2LN+EPnq8RU=";
};
cmakeFlags = attrs.cmakeFlags ++ [
diff --git a/contrib/libs/simdjson/include/simdjson/compiler_check.h b/contrib/libs/simdjson/include/simdjson/compiler_check.h
index b306ab3247..98b5865614 100644
--- a/contrib/libs/simdjson/include/simdjson/compiler_check.h
+++ b/contrib/libs/simdjson/include/simdjson/compiler_check.h
@@ -56,9 +56,20 @@
#endif
#endif
+#if defined(__apple_build_version__)
+#if __apple_build_version__ < 14000000
+#define SIMDJSON_CONCEPT_DISABLED 1 // apple-clang/13 doesn't support std::convertible_to
+#endif
+#endif
+
+
#if defined(__cpp_concepts) && !defined(SIMDJSON_CONCEPT_DISABLED)
+#if __cpp_concepts >= 201907L
#include <utility>
#define SIMDJSON_SUPPORTS_DESERIALIZATION 1
+#else
+#define SIMDJSON_SUPPORTS_DESERIALIZATION 0
+#endif
#else // defined(__cpp_concepts) && !defined(SIMDJSON_CONCEPT_DISABLED)
#define SIMDJSON_SUPPORTS_DESERIALIZATION 0
#endif // defined(__cpp_concepts) && !defined(SIMDJSON_CONCEPT_DISABLED)
diff --git a/contrib/libs/simdjson/include/simdjson/portability.h b/contrib/libs/simdjson/include/simdjson/portability.h
index 5826903db8..b7e1b0f75e 100644
--- a/contrib/libs/simdjson/include/simdjson/portability.h
+++ b/contrib/libs/simdjson/include/simdjson/portability.h
@@ -6,11 +6,15 @@
#include <cstdlib>
#include <cfloat>
#include <cassert>
+#include <climits>
#ifndef _WIN32
// strcasecmp, strncasecmp
#include <strings.h>
#endif
+static_assert(CHAR_BIT == 8, "simdjson requires 8-bit bytes");
+
+
// We are using size_t without namespace std:: throughout the project
using std::size_t;
@@ -44,6 +48,7 @@ using std::size_t;
#elif defined(__loongarch_lp64)
#define SIMDJSON_IS_LOONGARCH64 1
#elif defined(__PPC64__) || defined(_M_PPC64)
+#define SIMDJSON_IS_PPC64 1
#if defined(__ALTIVEC__)
#define SIMDJSON_IS_PPC64_VMX 1
#endif // defined(__ALTIVEC__)
diff --git a/contrib/libs/simdjson/include/simdjson/simdjson_version.h b/contrib/libs/simdjson/include/simdjson/simdjson_version.h
index 7c6ef648b0..0f102f299d 100644
--- a/contrib/libs/simdjson/include/simdjson/simdjson_version.h
+++ b/contrib/libs/simdjson/include/simdjson/simdjson_version.h
@@ -4,7 +4,7 @@
#define SIMDJSON_SIMDJSON_VERSION_H
/** The version of simdjson being used (major.minor.revision) */
-#define SIMDJSON_VERSION "3.11.3"
+#define SIMDJSON_VERSION "3.11.4"
namespace simdjson {
enum {
@@ -19,7 +19,7 @@ enum {
/**
* The revision (major.minor.REVISION) of simdjson being used.
*/
- SIMDJSON_VERSION_REVISION = 3
+ SIMDJSON_VERSION_REVISION = 4
};
} // namespace simdjson
diff --git a/contrib/libs/simdjson/ya.make b/contrib/libs/simdjson/ya.make
index b9fc6efde8..f9f60907d8 100644
--- a/contrib/libs/simdjson/ya.make
+++ b/contrib/libs/simdjson/ya.make
@@ -10,9 +10,9 @@ LICENSE(
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(3.11.3)
+VERSION(3.11.4)
-ORIGINAL_SOURCE(https://github.com/simdjson/simdjson/archive/v3.11.3.tar.gz)
+ORIGINAL_SOURCE(https://github.com/simdjson/simdjson/archive/v3.11.4.tar.gz)
ADDINCL(
GLOBAL contrib/libs/simdjson/include