Skip to content

Commit ffc901c

Browse files
committed
[workspace] Upgrade abseil_cpp_internal to latest
1 parent 131c418 commit ffc901c

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

tools/workspace/abseil_cpp_internal/patches/inline_namespace.patch

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ designed for end-user customization, and that's basically all we're doing here.
1111
@@ -205,8 +205,8 @@
1212
// be changed to a new, unique identifier name. In particular "head" is not
1313
// allowed.
14-
14+
1515
-#define ABSL_OPTION_USE_INLINE_NAMESPACE 0
1616
-#define ABSL_OPTION_INLINE_NAMESPACE_NAME head
1717
+#define ABSL_OPTION_USE_INLINE_NAMESPACE 1
1818
+#define ABSL_OPTION_INLINE_NAMESPACE_NAME drake_vendor
19-
19+
2020
// ABSL_OPTION_HARDENED
2121
//
2222

2323
--- absl/debugging/symbolize_elf.inc
2424
+++ absl/debugging/symbolize_elf.inc
25-
@@ -1653,9 +1653,11 @@
25+
@@ -1764,11 +1764,13 @@ bool Symbolize(const void *pc, char *out, int out_size) {
2626
ABSL_NAMESPACE_END
2727
} // namespace absl
28-
28+
2929
+#if 0 // This (dead) code disobeys the drake_vendor inline namespace.
3030
extern "C" bool AbslInternalGetFileMappingHint(const void **start,
3131
const void **end, uint64_t *offset,
@@ -34,3 +34,5 @@ designed for end-user customization, and that's basically all we're doing here.
3434
filename);
3535
}
3636
+#endif
37+
38+
#undef ABSL_INTERNAL_HAVE_PPC64_ELFV1_ABI

tools/workspace/abseil_cpp_internal/repository.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ def abseil_cpp_internal_repository(
66
github_archive(
77
name = name,
88
repository = "abseil/abseil-cpp",
9-
commit = "c65fa830409351c8eca1f741cc153255ae59d258",
10-
sha256 = "8e7464c2682a4c749aed8129f15301ae7609d9ad68722b0870b6bda12583d7a1", # noqa
9+
commit = "4eb1e49cf32ac70dd1d393812ecbcad1d90af68e",
10+
sha256 = "b1d29f1b90546193e20b6dda5171c8ab7c969ca4fb95027edba82101cf705837", # noqa
1111
patches = [
1212
":patches/upstream/specific_iostream_includes.patch",
1313
":patches/disable_int128_on_clang.patch",

0 commit comments

Comments
 (0)