Minor cleanup: IWYU, clang-tidy, etc.

PiperOrigin-RevId: 618273802
protocolbuffers · Mar 22, 2024 · 14f712d · 14f712d
1 parent e56ebce
commit 14f712d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel
@@ -333,6 +333,7 @@ cc_library(
     deps = [
         "//src/google/protobuf:port",
         "//src/google/protobuf/stubs:lite",
+        "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/log:absl_check",
         "@com_google_absl//absl/log:absl_log",
         "@com_google_absl//absl/numeric:bits",

diff --git a/src/google/protobuf/arena_align.h b/src/google/protobuf/arena_align.h
@@ -55,6 +55,7 @@
 #include <cstddef>
 #include <cstdint>
 
+#include "google/protobuf/stubs/common.h"
 #include "absl/log/absl_check.h"
 #include "absl/numeric/bits.h"
 

diff --git a/src/google/protobuf/thread_safe_arena.h b/src/google/protobuf/thread_safe_arena.h
@@ -10,16 +10,16 @@
 #ifndef GOOGLE_PROTOBUF_THREAD_SAFE_ARENA_H__
 #define GOOGLE_PROTOBUF_THREAD_SAFE_ARENA_H__
 
-#include <algorithm>
 #include <atomic>
-#include <string>
+#include <cstddef>
+#include <cstdint>
 #include <type_traits>
-#include <utility>
+#include <vector>
 
+#include "absl/base/attributes.h"
 #include "absl/synchronization/mutex.h"
 #include "google/protobuf/arena_align.h"
 #include "google/protobuf/arena_allocation_policy.h"
-#include "google/protobuf/arena_cleanup.h"
 #include "google/protobuf/arenaz_sampler.h"
 #include "google/protobuf/port.h"
 #include "google/protobuf/serial_arena.h"