Skip to content

Bump required Abseil to 20260526.0 #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmr merged 2 commits into from
Jul 16, 2026
Merged

Bump required Abseil to 20260526.0 #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
424bc82
Fix build with Abseil 20260526.0
daeho-ro Jul 16, 2026
aae3a64
Bump Abseil version references to 20260526.0
daeho-ro Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ if (NOT TARGET absl::base)
message(STATUS "Downloading and building abseil-cpp...")
FetchContent_Declare(
absl
URL https://github.com/abseil/abseil-cpp/archive/refs/tags/20250814.1.zip
URL https://github.com/abseil/abseil-cpp/archive/refs/tags/20260526.0.zip
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
)
set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "" FORCE)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ This issue may require revision of boringssl or exactfloat.
[g++ >= 7.5](https://gcc.gnu.org/) or
[clang >= 14.0.0](https://clang.llvm.org/)
* [Abseil](https://github.com/abseil/abseil-cpp) LTS
[`20250814`](https://github.com/abseil/abseil-cpp/releases/tag/20250814.1)
[`20260526`](https://github.com/abseil/abseil-cpp/releases/tag/20260526.0)
(standard library extensions). This exact version must be used.
* [googletest testing framework >= 1.10](https://github.com/google/googletest)
(to build tests and example programs, optional)
Expand Down
2 changes: 1 addition & 1 deletion src/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module(
)

# Production dependencies
bazel_dep(name = "abseil-cpp", version = "20260107.1")
bazel_dep(name = "abseil-cpp", version = "20260526.0")
bazel_dep(name = "bazel_skylib", version = "1.9.0")
bazel_dep(name = "rules_cc", version = "0.2.22")

Expand Down
20 changes: 7 additions & 13 deletions src/s2/util/gtl/compact_array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
#include <type_traits>
#include <utility>

#include "absl/base/internal/throw_delegate.h"
#include "absl/base/macros.h"
#include "absl/base/optimization.h"
#include "absl/base/throw_delegate.h"
#include "absl/log/absl_check.h"
#include "absl/meta/type_traits.h"
#include "absl/numeric/bits.h"
Expand Down Expand Up @@ -245,8 +245,7 @@ class compact_array_base {
// This Insert() is private because it might return the end().
iterator Insert(const_iterator p, const value_type& v) {
if (ABSL_PREDICT_FALSE(size() >= kMaxSize)) {
// NOLINTNEXTLINE(build/namespaces)
absl::base_internal::ThrowStdLengthError("compact_array size exceeded");
absl::ThrowStdLengthError("compact_array size exceeded");
}
iterator r = make_hole(p, 1);
*r = v;
Expand All @@ -260,8 +259,7 @@ class compact_array_base {

void insert(const_iterator p, size_type n, const value_type& v) {
if (ABSL_PREDICT_FALSE(n > kMaxSize - size())) {
// NOLINTNEXTLINE(build/namespaces)
absl::base_internal::ThrowStdLengthError("compact_array size exceeded");
absl::ThrowStdLengthError("compact_array size exceeded");
}
value_insert(p, n, v);
}
Expand Down Expand Up @@ -321,16 +319,14 @@ class compact_array_base {

reference at(size_type n) {
if (ABSL_PREDICT_FALSE(n >= size_)) {
// NOLINTNEXTLINE(build/namespaces)
absl::base_internal::ThrowStdOutOfRange("compact_array_base::at");
absl::ThrowStdOutOfRange("compact_array_base::at");
}
return Array()[n];
}

const_reference at(size_type n) const {
if (ABSL_PREDICT_FALSE(n >= size_)) {
// NOLINTNEXTLINE(build/namespaces)
absl::base_internal::ThrowStdOutOfRange("compact_array_base::at");
absl::ThrowStdOutOfRange("compact_array_base::at");
}
return ConstArray()[n];
}
Expand Down Expand Up @@ -477,8 +473,7 @@ class compact_array_base {

void value_insert(const_iterator p, size_type n, const value_type& v) {
if (ABSL_PREDICT_FALSE(n > kMaxSize - size())) {
// NOLINTNEXTLINE(build/namespaces)
absl::base_internal::ThrowStdLengthError("compact_array size exceeded");
absl::ThrowStdLengthError("compact_array size exceeded");
}
iterator hole = make_hole(p, n);
std::fill(hole, hole + n, v);
Expand All @@ -498,8 +493,7 @@ class compact_array_base {
std::forward_iterator_tag) {
size_type n = std::distance(first, last);
if (ABSL_PREDICT_FALSE(n > kMaxSize - size())) {
// NOLINTNEXTLINE(build/namespaces)
absl::base_internal::ThrowStdLengthError("compact_array size exceeded");
absl::ThrowStdLengthError("compact_array size exceeded");
}
std::copy(first, last, make_hole(p, n));
}
Expand Down