From db54820f3f7a53020a2571754257aeccc5aa26ce Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Tue, 8 Nov 2022 10:07:14 -0800 Subject: [PATCH] Internal change PiperOrigin-RevId: 486982523 --- src/google/protobuf/any_lite.cc | 2 +- src/google/protobuf/arenastring.cc | 2 +- src/google/protobuf/arenastring_unittest.cc | 4 ++-- src/google/protobuf/extension_set.cc | 4 ++-- src/google/protobuf/extension_set.h | 2 +- src/google/protobuf/extension_set_heavy.cc | 2 +- src/google/protobuf/generated_message_bases.h | 2 +- src/google/protobuf/generated_message_util.cc | 4 ++-- src/google/protobuf/implicit_weak_message.h | 2 +- src/google/protobuf/inlined_string_field_unittest.cc | 4 ++-- src/google/protobuf/map_entry_lite.h | 2 +- src/google/protobuf/map_field_lite.h | 2 +- src/google/protobuf/map_type_handler.h | 2 +- src/google/protobuf/message.cc | 4 ++-- src/google/protobuf/message_lite.cc | 8 ++++---- src/google/protobuf/message_lite.h | 2 +- src/google/protobuf/parse_context.h | 4 ++-- src/google/protobuf/text_format.cc | 12 ++++++------ src/google/protobuf/text_format_unittest.cc | 4 ++-- src/google/protobuf/unknown_field_set.cc | 8 ++++---- src/google/protobuf/unknown_field_set.h | 2 +- src/google/protobuf/wire_format.cc | 6 +++--- 22 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/google/protobuf/any_lite.cc b/src/google/protobuf/any_lite.cc index a15d19fa09..6f689af1a3 100644 --- a/src/google/protobuf/any_lite.cc +++ b/src/google/protobuf/any_lite.cc @@ -28,12 +28,12 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "google/protobuf/any.h" #include "google/protobuf/arenastring.h" #include "google/protobuf/generated_message_util.h" +#include "google/protobuf/io/zero_copy_stream_impl_lite.h" namespace google { namespace protobuf { diff --git a/src/google/protobuf/arenastring.cc b/src/google/protobuf/arenastring.cc index 9a0a223825..8c21b1dd0c 100644 --- a/src/google/protobuf/arenastring.cc +++ b/src/google/protobuf/arenastring.cc @@ -34,9 +34,9 @@ #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.h" -#include "google/protobuf/io/coded_stream.h" #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" +#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/message_lite.h" #include "google/protobuf/parse_context.h" diff --git a/src/google/protobuf/arenastring_unittest.cc b/src/google/protobuf/arenastring_unittest.cc index efb4bf3ce9..6aa500bd83 100644 --- a/src/google/protobuf/arenastring_unittest.cc +++ b/src/google/protobuf/arenastring_unittest.cc @@ -39,12 +39,12 @@ #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.h" -#include "google/protobuf/io/coded_stream.h" -#include "google/protobuf/io/zero_copy_stream_impl.h" #include "google/protobuf/generated_message_util.h" #include "google/protobuf/message_lite.h" #include #include "absl/strings/string_view.h" +#include "google/protobuf/io/coded_stream.h" +#include "google/protobuf/io/zero_copy_stream_impl.h" // Must be included last. diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc index 791c1e3489..6cd1248ddd 100644 --- a/src/google/protobuf/extension_set.cc +++ b/src/google/protobuf/extension_set.cc @@ -38,12 +38,12 @@ #include #include "google/protobuf/stubs/common.h" -#include "google/protobuf/io/coded_stream.h" -#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/arena.h" #include "absl/container/flat_hash_set.h" #include "absl/hash/hash.h" #include "google/protobuf/extension_set_inl.h" +#include "google/protobuf/io/coded_stream.h" +#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/message_lite.h" #include "google/protobuf/metadata_lite.h" #include "google/protobuf/parse_context.h" diff --git a/src/google/protobuf/extension_set.h b/src/google/protobuf/extension_set.h index 2ce566aec6..8be14c3381 100644 --- a/src/google/protobuf/extension_set.h +++ b/src/google/protobuf/extension_set.h @@ -49,8 +49,8 @@ #include "google/protobuf/stubs/common.h" #include "google/protobuf/stubs/logging.h" #include "google/protobuf/port.h" -#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/port.h" +#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/parse_context.h" #include "google/protobuf/repeated_field.h" #include "google/protobuf/wire_format_lite.h" diff --git a/src/google/protobuf/extension_set_heavy.cc b/src/google/protobuf/extension_set_heavy.cc index 0ccce3c373..abf9e5fe76 100644 --- a/src/google/protobuf/extension_set_heavy.cc +++ b/src/google/protobuf/extension_set_heavy.cc @@ -35,13 +35,13 @@ // Contains methods defined in extension_set.h which cannot be part of the // lite library because they use descriptors or reflection. -#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" #include "absl/base/casts.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.pb.h" #include "google/protobuf/extension_set.h" #include "google/protobuf/extension_set_inl.h" +#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/message.h" #include "google/protobuf/message_lite.h" #include "google/protobuf/parse_context.h" diff --git a/src/google/protobuf/generated_message_bases.h b/src/google/protobuf/generated_message_bases.h index e8310799e4..d542ca414e 100644 --- a/src/google/protobuf/generated_message_bases.h +++ b/src/google/protobuf/generated_message_bases.h @@ -35,9 +35,9 @@ #ifndef GOOGLE_PROTOBUF_GENERATED_MESSAGE_BASES_H__ #define GOOGLE_PROTOBUF_GENERATED_MESSAGE_BASES_H__ -#include "google/protobuf/io/zero_copy_stream_impl.h" #include "google/protobuf/arena.h" #include "google/protobuf/generated_message_util.h" +#include "google/protobuf/io/zero_copy_stream_impl.h" #include "google/protobuf/message.h" #include "google/protobuf/parse_context.h" diff --git a/src/google/protobuf/generated_message_util.cc b/src/google/protobuf/generated_message_util.cc index f9c75c64d0..4dd5ccbdb0 100644 --- a/src/google/protobuf/generated_message_util.cc +++ b/src/google/protobuf/generated_message_util.cc @@ -38,10 +38,10 @@ #include #include -#include "google/protobuf/io/coded_stream.h" -#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/arenastring.h" #include "google/protobuf/extension_set.h" +#include "google/protobuf/io/coded_stream.h" +#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/message_lite.h" #include "google/protobuf/metadata_lite.h" #include "google/protobuf/repeated_field.h" diff --git a/src/google/protobuf/implicit_weak_message.h b/src/google/protobuf/implicit_weak_message.h index 1915e8cbad..979c89750c 100644 --- a/src/google/protobuf/implicit_weak_message.h +++ b/src/google/protobuf/implicit_weak_message.h @@ -33,8 +33,8 @@ #include -#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" +#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/message_lite.h" #include "google/protobuf/repeated_field.h" diff --git a/src/google/protobuf/inlined_string_field_unittest.cc b/src/google/protobuf/inlined_string_field_unittest.cc index 53552df1ca..bba2289d3d 100644 --- a/src/google/protobuf/inlined_string_field_unittest.cc +++ b/src/google/protobuf/inlined_string_field_unittest.cc @@ -40,11 +40,11 @@ #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.h" -#include "google/protobuf/io/coded_stream.h" -#include "google/protobuf/io/zero_copy_stream_impl.h" #include "google/protobuf/arenastring.h" #include #include "absl/strings/string_view.h" +#include "google/protobuf/io/coded_stream.h" +#include "google/protobuf/io/zero_copy_stream_impl.h" #include "google/protobuf/message.h" diff --git a/src/google/protobuf/map_entry_lite.h b/src/google/protobuf/map_entry_lite.h index be11257260..411be6e4c1 100644 --- a/src/google/protobuf/map_entry_lite.h +++ b/src/google/protobuf/map_entry_lite.h @@ -37,11 +37,11 @@ #include #include -#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" #include "absl/base/casts.h" #include "google/protobuf/arenastring.h" #include "google/protobuf/generated_message_util.h" +#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/map.h" #include "google/protobuf/map_type_handler.h" #include "google/protobuf/parse_context.h" diff --git a/src/google/protobuf/map_field_lite.h b/src/google/protobuf/map_field_lite.h index d8e539c0d3..0576d0d0cd 100644 --- a/src/google/protobuf/map_field_lite.h +++ b/src/google/protobuf/map_field_lite.h @@ -33,8 +33,8 @@ #include -#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/port.h" +#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/map.h" #include "google/protobuf/map_entry_lite.h" #include "google/protobuf/parse_context.h" diff --git a/src/google/protobuf/map_type_handler.h b/src/google/protobuf/map_type_handler.h index c092792346..8979734b0b 100644 --- a/src/google/protobuf/map_type_handler.h +++ b/src/google/protobuf/map_type_handler.h @@ -31,9 +31,9 @@ #ifndef GOOGLE_PROTOBUF_MAP_TYPE_HANDLER_H__ #define GOOGLE_PROTOBUF_MAP_TYPE_HANDLER_H__ -#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" #include "google/protobuf/arenastring.h" +#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/parse_context.h" #include "google/protobuf/wire_format_lite.h" diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index 1b464365be..492e0f02fc 100644 --- a/src/google/protobuf/message.cc +++ b/src/google/protobuf/message.cc @@ -39,8 +39,6 @@ #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.h" -#include "google/protobuf/io/coded_stream.h" -#include "google/protobuf/io/zero_copy_stream_impl.h" #include "absl/base/casts.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" @@ -52,6 +50,8 @@ #include "google/protobuf/generated_message_reflection.h" #include "google/protobuf/generated_message_tctable_impl.h" #include "google/protobuf/generated_message_util.h" +#include "google/protobuf/io/coded_stream.h" +#include "google/protobuf/io/zero_copy_stream_impl.h" #include "google/protobuf/map_field.h" #include "google/protobuf/map_field_inl.h" #include "google/protobuf/parse_context.h" diff --git a/src/google/protobuf/message_lite.cc b/src/google/protobuf/message_lite.cc index eea99e0e2c..161758df57 100644 --- a/src/google/protobuf/message_lite.cc +++ b/src/google/protobuf/message_lite.cc @@ -42,10 +42,6 @@ #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.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" -#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/arena.h" #include "absl/base/dynamic_annotations.h" #include "absl/strings/cord.h" @@ -54,6 +50,10 @@ #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" #include "google/protobuf/generated_message_util.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" +#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/parse_context.h" #include "google/protobuf/repeated_field.h" diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h index 92e5b73845..38e903eb06 100644 --- a/src/google/protobuf/message_lite.h +++ b/src/google/protobuf/message_lite.h @@ -45,12 +45,12 @@ #include "google/protobuf/stubs/common.h" #include "google/protobuf/stubs/logging.h" -#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/arena.h" #include "google/protobuf/port.h" #include "absl/base/call_once.h" #include "absl/strings/string_view.h" #include "google/protobuf/explicitly_constructed.h" +#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/metadata_lite.h" #include "google/protobuf/port.h" diff --git a/src/google/protobuf/parse_context.h b/src/google/protobuf/parse_context.h index 182f3af48d..e1ff16c9b5 100644 --- a/src/google/protobuf/parse_context.h +++ b/src/google/protobuf/parse_context.h @@ -36,8 +36,6 @@ #include #include -#include "google/protobuf/io/coded_stream.h" -#include "google/protobuf/io/zero_copy_stream.h" #include "google/protobuf/arena.h" #include "absl/strings/internal/resize_uninitialized.h" #include "absl/strings/string_view.h" @@ -45,6 +43,8 @@ #include "google/protobuf/endian.h" #include "google/protobuf/implicit_weak_message.h" #include "google/protobuf/inlined_string_field.h" +#include "google/protobuf/io/coded_stream.h" +#include "google/protobuf/io/zero_copy_stream.h" #include "google/protobuf/metadata_lite.h" #include "google/protobuf/port.h" #include "google/protobuf/repeated_field.h" diff --git a/src/google/protobuf/text_format.cc b/src/google/protobuf/text_format.cc index fbf1f717c2..7ab3d488e7 100644 --- a/src/google/protobuf/text_format.cc +++ b/src/google/protobuf/text_format.cc @@ -46,10 +46,6 @@ #include #include -#include "google/protobuf/io/coded_stream.h" -#include "google/protobuf/io/tokenizer.h" -#include "google/protobuf/io/zero_copy_stream.h" -#include "google/protobuf/io/zero_copy_stream_impl.h" #include "absl/strings/ascii.h" #include "absl/strings/escaping.h" #include "absl/strings/numbers.h" @@ -60,7 +56,11 @@ #include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.pb.h" #include "google/protobuf/dynamic_message.h" +#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/strtod.h" +#include "google/protobuf/io/tokenizer.h" +#include "google/protobuf/io/zero_copy_stream.h" +#include "google/protobuf/io/zero_copy_stream_impl.h" #include "google/protobuf/map_field.h" #include "google/protobuf/message.h" #include "google/protobuf/repeated_field.h" @@ -273,7 +273,7 @@ const Descriptor* DefaultFinderFindAnyType(const Message& message, // =========================================================================== // Internal class for parsing an ASCII representation of a Protocol Message. // This class makes use of the Protocol Message compiler's tokenizer found -// in //net/proto2/io/public/tokenizer.h. Note that class's Parse +// in //third_party/protobuf/io/tokenizer.h. Note that class's Parse // method is *not* thread-safe and should only be used in a single thread at // a time. @@ -1383,7 +1383,7 @@ class TextFormat::Parser::ParserImpl { // =========================================================================== // Internal class for writing text to the io::ZeroCopyOutputStream. Adapted -// from the Printer found in //net/proto2/io/public/printer.h +// from the Printer found in //third_party/protobuf/io/printer.h class TextFormat::Printer::TextGenerator : public TextFormat::BaseTextGenerator { public: diff --git a/src/google/protobuf/text_format_unittest.cc b/src/google/protobuf/text_format_unittest.cc index 79c9780e9a..bbf6943674 100644 --- a/src/google/protobuf/text_format_unittest.cc +++ b/src/google/protobuf/text_format_unittest.cc @@ -50,8 +50,6 @@ #include "google/protobuf/unittest.pb.h" #include "google/protobuf/unittest_mset.pb.h" #include "google/protobuf/unittest_mset_wire_format.pb.h" -#include "google/protobuf/io/tokenizer.h" -#include "google/protobuf/io/zero_copy_stream_impl.h" #include #include "google/protobuf/testing/googletest.h" #include @@ -61,6 +59,8 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_replace.h" #include "absl/strings/substitute.h" +#include "google/protobuf/io/tokenizer.h" +#include "google/protobuf/io/zero_copy_stream_impl.h" #include "google/protobuf/map_unittest.pb.h" #include "google/protobuf/test_util.h" #include "google/protobuf/test_util2.h" diff --git a/src/google/protobuf/unknown_field_set.cc b/src/google/protobuf/unknown_field_set.cc index 7eecd300eb..8b104f7e4c 100644 --- a/src/google/protobuf/unknown_field_set.cc +++ b/src/google/protobuf/unknown_field_set.cc @@ -36,15 +36,15 @@ #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.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" -#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "absl/strings/cord.h" #include "absl/strings/internal/resize_uninitialized.h" #include "google/protobuf/extension_set.h" #include "google/protobuf/generated_message_tctable_decl.h" #include "google/protobuf/generated_message_tctable_impl.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" +#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/parse_context.h" #include "google/protobuf/wire_format.h" #include "google/protobuf/wire_format_lite.h" diff --git a/src/google/protobuf/unknown_field_set.h b/src/google/protobuf/unknown_field_set.h index 04b630ebbd..85e51a577f 100644 --- a/src/google/protobuf/unknown_field_set.h +++ b/src/google/protobuf/unknown_field_set.h @@ -46,9 +46,9 @@ #include "google/protobuf/stubs/common.h" #include "google/protobuf/stubs/logging.h" +#include "google/protobuf/port.h" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" -#include "google/protobuf/port.h" #include "google/protobuf/message_lite.h" #include "google/protobuf/parse_context.h" #include "google/protobuf/port.h" diff --git a/src/google/protobuf/wire_format.cc b/src/google/protobuf/wire_format.cc index e65dad0ca5..ff542b734d 100644 --- a/src/google/protobuf/wire_format.cc +++ b/src/google/protobuf/wire_format.cc @@ -40,13 +40,13 @@ #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.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" #include "absl/strings/cord.h" #include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.pb.h" #include "google/protobuf/dynamic_message.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" #include "google/protobuf/map_field.h" #include "google/protobuf/map_field_inl.h" #include "google/protobuf/message.h"