aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2025-06-20 11:22:57 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2025-06-20 11:51:02 +0300
commit1431a3f721b6fa41b34ee5e0a836f06901b5a324 (patch)
treeb476834ba49e4e26be01a35e691578730640b035
parent73c10e2d20b77e0980f0f9f155fa8fca5ba929a9 (diff)
downloadydb-1431a3f721b6fa41b34ee5e0a836f06901b5a324.tar.gz
Update contrib/restricted/abseil-cpp to 20250512.1
commit_hash:d6c19d9e9a68c6c524688a83e9adccbc4a856420
-rw-r--r--contrib/restricted/abseil-cpp/.yandex_meta/override.nix4
-rw-r--r--contrib/restricted/abseil-cpp/absl/base/config.h2
-rw-r--r--contrib/restricted/abseil-cpp/absl/hash/internal/hash.h2
-rw-r--r--contrib/restricted/abseil-cpp/absl/time/time.h9
-rw-r--r--contrib/restricted/abseil-cpp/ya.make4
5 files changed, 12 insertions, 9 deletions
diff --git a/contrib/restricted/abseil-cpp/.yandex_meta/override.nix b/contrib/restricted/abseil-cpp/.yandex_meta/override.nix
index 646caf14599..3906b8a07d4 100644
--- a/contrib/restricted/abseil-cpp/.yandex_meta/override.nix
+++ b/contrib/restricted/abseil-cpp/.yandex_meta/override.nix
@@ -1,11 +1,11 @@
self: super: with self; rec {
- version = "20250512.0";
+ version = "20250512.1";
src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
rev = version;
- hash = "sha256-Tuw1Py+LQdXS+bizXsduPjjEU5YIAVFvL+iJ+w8JoSU=";
+ hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk=";
};
patches = [];
diff --git a/contrib/restricted/abseil-cpp/absl/base/config.h b/contrib/restricted/abseil-cpp/absl/base/config.h
index 9170a6f62e1..1a9bc591d4e 100644
--- a/contrib/restricted/abseil-cpp/absl/base/config.h
+++ b/contrib/restricted/abseil-cpp/absl/base/config.h
@@ -118,7 +118,7 @@
// LTS releases can be obtained from
// https://github.com/abseil/abseil-cpp/releases.
#define ABSL_LTS_RELEASE_VERSION 20250512
-#define ABSL_LTS_RELEASE_PATCH_LEVEL 0
+#define ABSL_LTS_RELEASE_PATCH_LEVEL 1
// Helper macro to convert a CPP variable to a string literal.
#define ABSL_INTERNAL_DO_TOKEN_STR(x) #x
diff --git a/contrib/restricted/abseil-cpp/absl/hash/internal/hash.h b/contrib/restricted/abseil-cpp/absl/hash/internal/hash.h
index 63b35490b21..eb53823f976 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/internal/hash.h
+++ b/contrib/restricted/abseil-cpp/absl/hash/internal/hash.h
@@ -39,7 +39,7 @@
// For feature testing and determining which headers can be included.
#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L || \
- ABSL_INTERNAL_VERSION_HEADER_AVAILABLE
+ defined(ABSL_INTERNAL_VERSION_HEADER_AVAILABLE)
#include <version>
#else
#include <ciso646>
diff --git a/contrib/restricted/abseil-cpp/absl/time/time.h b/contrib/restricted/abseil-cpp/absl/time/time.h
index db17a4cd40b..53bca90d156 100644
--- a/contrib/restricted/abseil-cpp/absl/time/time.h
+++ b/contrib/restricted/abseil-cpp/absl/time/time.h
@@ -1869,8 +1869,9 @@ ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Nanoseconds(Duration d) {
time_internal::GetRepHi(d) >> 33 == 0) {
return (time_internal::GetRepHi(d) * 1000 * 1000 * 1000) +
(time_internal::GetRepLo(d) / time_internal::kTicksPerNanosecond);
+ } else {
+ return d / Nanoseconds(1);
}
- return d / Nanoseconds(1);
}
ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Microseconds(
@@ -1880,8 +1881,9 @@ ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Microseconds(
return (time_internal::GetRepHi(d) * 1000 * 1000) +
(time_internal::GetRepLo(d) /
(time_internal::kTicksPerNanosecond * 1000));
+ } else {
+ return d / Microseconds(1);
}
- return d / Microseconds(1);
}
ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Milliseconds(
@@ -1891,8 +1893,9 @@ ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Milliseconds(
return (time_internal::GetRepHi(d) * 1000) +
(time_internal::GetRepLo(d) /
(time_internal::kTicksPerNanosecond * 1000 * 1000));
+ } else {
+ return d / Milliseconds(1);
}
- return d / Milliseconds(1);
}
ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t ToInt64Seconds(Duration d) {
diff --git a/contrib/restricted/abseil-cpp/ya.make b/contrib/restricted/abseil-cpp/ya.make
index 724c19c8e91..3610bcb503b 100644
--- a/contrib/restricted/abseil-cpp/ya.make
+++ b/contrib/restricted/abseil-cpp/ya.make
@@ -9,9 +9,9 @@ LICENSE(
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(20250512.0)
+VERSION(20250512.1)
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20250512.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20250512.1.tar.gz)
PEERDIR(
library/cpp/sanitizer/include