Add dependency on absl::layout, and explicitly include absl layout in…

…cludes This header was transitively included from (deprecated) absl cord includes. PiperOrigin-RevId: 562008066
protocolbuffers · Sep 11, 2023 · 96c1a7d · 96c1a7d
1 parent d3c44a4
commit 96c1a7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel
@@ -331,6 +331,7 @@ cc_library(
         ":arena_cleanup",
         ":string_block",
         "//src/google/protobuf/stubs:lite",
+        "@com_google_absl//absl/container:layout",
         "@com_google_absl//absl/log:absl_check",
         "@com_google_absl//absl/log:absl_log",
         "@com_google_absl//absl/synchronization",

diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc
@@ -40,6 +40,7 @@
 #include <vector>
 
 #include "absl/base/attributes.h"
+#include "absl/container/internal/layout.h"
 #include "absl/synchronization/mutex.h"
 #include "google/protobuf/arena_allocation_policy.h"
 #include "google/protobuf/arenaz_sampler.h"