diff --git a/src/google/protobuf/arenastring.h b/src/google/protobuf/arenastring.h index 25179b8b40..338e9d82c5 100644 --- a/src/google/protobuf/arenastring.h +++ b/src/google/protobuf/arenastring.h @@ -38,8 +38,8 @@ #include #include "absl/log/absl_check.h" -#include "google/protobuf/arena.h" #include "absl/strings/string_view.h" +#include "google/protobuf/arena.h" #include "google/protobuf/explicitly_constructed.h" #include "google/protobuf/port.h" diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc index cb8196159f..7e96279847 100644 --- a/src/google/protobuf/extension_set.cc +++ b/src/google/protobuf/extension_set.cc @@ -40,9 +40,9 @@ #include #include "google/protobuf/stubs/common.h" -#include "google/protobuf/arena.h" #include "absl/container/flat_hash_set.h" #include "absl/hash/hash.h" +#include "google/protobuf/arena.h" #include "google/protobuf/extension_set_inl.h" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/message_lite.h" diff --git a/src/google/protobuf/extension_set_heavy.cc b/src/google/protobuf/extension_set_heavy.cc index d0da25b243..81b480d9be 100644 --- a/src/google/protobuf/extension_set_heavy.cc +++ b/src/google/protobuf/extension_set_heavy.cc @@ -37,8 +37,8 @@ #include -#include "google/protobuf/arena.h" #include "absl/log/absl_check.h" +#include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.pb.h" #include "google/protobuf/extension_set.h" diff --git a/src/google/protobuf/extension_set_unittest.cc b/src/google/protobuf/extension_set_unittest.cc index 26ec23a38d..a968af8088 100644 --- a/src/google/protobuf/extension_set_unittest.cc +++ b/src/google/protobuf/extension_set_unittest.cc @@ -35,12 +35,12 @@ #include "google/protobuf/extension_set.h" #include "google/protobuf/descriptor.pb.h" -#include "google/protobuf/arena.h" #include "google/protobuf/testing/googletest.h" #include #include "absl/base/casts.h" #include "absl/strings/cord.h" #include "absl/strings/match.h" +#include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/dynamic_message.h" #include "google/protobuf/io/coded_stream.h" diff --git a/src/google/protobuf/generated_message_reflection_unittest.cc b/src/google/protobuf/generated_message_reflection_unittest.cc index e66f3142c5..fbc220860a 100644 --- a/src/google/protobuf/generated_message_reflection_unittest.cc +++ b/src/google/protobuf/generated_message_reflection_unittest.cc @@ -46,12 +46,12 @@ #include -#include "google/protobuf/arena.h" #include #include "google/protobuf/testing/googletest.h" #include #include "absl/log/absl_check.h" #include "absl/strings/cord.h" +#include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/map_test_util.h" #include "google/protobuf/map_unittest.pb.h" diff --git a/src/google/protobuf/inlined_string_field.cc b/src/google/protobuf/inlined_string_field.cc index 04c3bed070..920548aded 100644 --- a/src/google/protobuf/inlined_string_field.cc +++ b/src/google/protobuf/inlined_string_field.cc @@ -34,10 +34,10 @@ #include #include -#include "google/protobuf/arena.h" #include "absl/log/absl_check.h" #include "absl/strings/internal/resize_uninitialized.h" #include "absl/strings/string_view.h" +#include "google/protobuf/arena.h" #include "google/protobuf/arenastring.h" #include "google/protobuf/generated_message_util.h" #include "google/protobuf/message_lite.h" diff --git a/src/google/protobuf/map_field.h b/src/google/protobuf/map_field.h index 9a83779db0..f531bed664 100644 --- a/src/google/protobuf/map_field.h +++ b/src/google/protobuf/map_field.h @@ -35,8 +35,8 @@ #include #include -#include "google/protobuf/arena.h" #include "absl/synchronization/mutex.h" +#include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/generated_message_reflection.h" #include "google/protobuf/generated_message_util.h" diff --git a/src/google/protobuf/map_field_test.cc b/src/google/protobuf/map_field_test.cc index 28286efa71..def1ed47ed 100644 --- a/src/google/protobuf/map_field_test.cc +++ b/src/google/protobuf/map_field_test.cc @@ -30,7 +30,6 @@ #include -#include "google/protobuf/arena.h" #include #include #include "absl/container/flat_hash_map.h" @@ -39,6 +38,7 @@ #include "absl/synchronization/barrier.h" #include "absl/synchronization/blocking_counter.h" #include "absl/types/optional.h" +#include "google/protobuf/arena.h" #include "google/protobuf/arena_test_util.h" #include "google/protobuf/map.h" #include "google/protobuf/map_field_inl.h" diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h index c981185c15..d671cfcf93 100644 --- a/src/google/protobuf/message.h +++ b/src/google/protobuf/message.h @@ -116,13 +116,13 @@ #include #include "google/protobuf/stubs/common.h" -#include "google/protobuf/arena.h" #include "absl/base/attributes.h" #include "absl/base/call_once.h" #include "absl/base/casts.h" #include "absl/functional/function_ref.h" #include "absl/strings/cord.h" #include "absl/strings/string_view.h" +#include "google/protobuf/arena.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/generated_message_reflection.h" #include "google/protobuf/generated_message_tctable_decl.h" diff --git a/src/google/protobuf/message_lite.cc b/src/google/protobuf/message_lite.cc index dd4e600a83..1ea4d02843 100644 --- a/src/google/protobuf/message_lite.cc +++ b/src/google/protobuf/message_lite.cc @@ -43,7 +43,6 @@ #include #include -#include "google/protobuf/arena.h" #include "absl/base/dynamic_annotations.h" #include "absl/log/absl_check.h" #include "absl/log/absl_log.h" @@ -54,6 +53,7 @@ #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" #include "absl/types/optional.h" +#include "google/protobuf/arena.h" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/zero_copy_stream.h" #include "google/protobuf/io/zero_copy_stream_impl.h" diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h index 12f1a26f5e..4fcb6e6ec4 100644 --- a/src/google/protobuf/message_lite.h +++ b/src/google/protobuf/message_lite.h @@ -44,11 +44,11 @@ #include #include "google/protobuf/stubs/common.h" -#include "google/protobuf/arena.h" #include "absl/base/call_once.h" #include "absl/log/absl_check.h" #include "absl/strings/cord.h" #include "absl/strings/string_view.h" +#include "google/protobuf/arena.h" #include "google/protobuf/explicitly_constructed.h" #include "google/protobuf/internal_visibility.h" #include "google/protobuf/io/coded_stream.h" diff --git a/src/google/protobuf/proto3_arena_unittest.cc b/src/google/protobuf/proto3_arena_unittest.cc index d0b98b3455..b2f9788575 100644 --- a/src/google/protobuf/proto3_arena_unittest.cc +++ b/src/google/protobuf/proto3_arena_unittest.cc @@ -32,9 +32,9 @@ #include #include -#include "google/protobuf/arena.h" #include #include "absl/strings/match.h" +#include "google/protobuf/arena.h" #include "google/protobuf/descriptor_legacy.h" #include "google/protobuf/test_util.h" #include "google/protobuf/text_format.h" diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index 6dd26b5c0e..28b12da88a 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -53,7 +53,6 @@ #include #include -#include "google/protobuf/arena.h" #include "absl/base/attributes.h" #include "absl/base/dynamic_annotations.h" #include "absl/base/optimization.h" @@ -61,6 +60,7 @@ #include "absl/log/absl_log.h" #include "absl/meta/type_traits.h" #include "absl/strings/cord.h" +#include "google/protobuf/arena.h" #include "google/protobuf/generated_enum_util.h" #include "google/protobuf/internal_visibility.h" #include "google/protobuf/message_lite.h" diff --git a/src/google/protobuf/repeated_ptr_field.h b/src/google/protobuf/repeated_ptr_field.h index 6d02c4c386..820494fcef 100644 --- a/src/google/protobuf/repeated_ptr_field.h +++ b/src/google/protobuf/repeated_ptr_field.h @@ -54,9 +54,9 @@ #include #include -#include "google/protobuf/arena.h" #include "absl/base/attributes.h" #include "absl/log/absl_check.h" +#include "google/protobuf/arena.h" #include "google/protobuf/internal_visibility.h" #include "google/protobuf/message_lite.h" #include "google/protobuf/port.h"