Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Internal change

Browse Source 
PiperOrigin-RevId: 487040126
pull/10940/head
Mike Kruskal 2 years ago committed by Copybara-Service
parent 53e4fa3279
commit c6af8635e8
4 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/google/protobuf/json/internal/parser_traits.h
  2. 4
      src/google/protobuf/json/internal/unparser_traits.h
  3. 4
      src/google/protobuf/json/internal/untyped_message.cc
  4. 4
      src/google/protobuf/json/internal/untyped_message.h

2
src/google/protobuf/json/internal/parser_traits.h
Unescape View File

@ -42,7 +42,6 @@
#include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.h"
#include "google/protobuf/dynamic_message.h" #include "google/protobuf/dynamic_message.h"
#include "google/protobuf/message.h" #include "google/protobuf/message.h"
#include "google/protobuf/wire_format_lite.h"
#include "absl/base/attributes.h" #include "absl/base/attributes.h"
#include "absl/base/casts.h" #include "absl/base/casts.h"
#include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_map.h"
@ -54,6 +53,7 @@
#include "google/protobuf/io/zero_copy_stream.h" #include "google/protobuf/io/zero_copy_stream.h"
#include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
#include "google/protobuf/json/internal/descriptor_traits.h" #include "google/protobuf/json/internal/descriptor_traits.h"
#include "google/protobuf/wire_format_lite.h"
#include "google/protobuf/stubs/status_macros.h" #include "google/protobuf/stubs/status_macros.h"
// Must be included last. // Must be included last.

4
src/google/protobuf/json/internal/unparser_traits.h
Unescape View File

@ -45,8 +45,6 @@
#include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.h"
#include "google/protobuf/dynamic_message.h" #include "google/protobuf/dynamic_message.h"
#include "google/protobuf/message.h" #include "google/protobuf/message.h"
#include "google/protobuf/wire_format.h"
#include "google/protobuf/wire_format_lite.h"
#include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_map.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/strings/escaping.h" #include "absl/strings/escaping.h"
@ -57,6 +55,8 @@
#include "absl/types/variant.h" #include "absl/types/variant.h"
#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/coded_stream.h"
#include "google/protobuf/json/internal/descriptor_traits.h" #include "google/protobuf/json/internal/descriptor_traits.h"
#include "google/protobuf/wire_format.h"
#include "google/protobuf/wire_format_lite.h"
#include "google/protobuf/stubs/status_macros.h" #include "google/protobuf/stubs/status_macros.h"
// Must be included last. // Must be included last.

4
src/google/protobuf/json/internal/untyped_message.cc
Unescape View File

@ -44,8 +44,6 @@
#include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.h"
#include "google/protobuf/dynamic_message.h" #include "google/protobuf/dynamic_message.h"
#include "google/protobuf/message.h" #include "google/protobuf/message.h"
#include "google/protobuf/wire_format.h"
#include "google/protobuf/wire_format_lite.h"
#include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_map.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
@ -56,6 +54,8 @@
#include "absl/types/variant.h" #include "absl/types/variant.h"
#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/coded_stream.h"
#include "google/protobuf/util/type_resolver.h" #include "google/protobuf/util/type_resolver.h"
#include "google/protobuf/wire_format.h"
#include "google/protobuf/wire_format_lite.h"
#include "utf8_validity.h" #include "utf8_validity.h"
#include "google/protobuf/stubs/status_macros.h" #include "google/protobuf/stubs/status_macros.h"

4
src/google/protobuf/json/internal/untyped_message.h
Unescape View File

@ -42,8 +42,6 @@
#include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.h"
#include "google/protobuf/dynamic_message.h" #include "google/protobuf/dynamic_message.h"
#include "google/protobuf/message.h" #include "google/protobuf/message.h"
#include "google/protobuf/wire_format.h"
#include "google/protobuf/wire_format_lite.h"
#include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_map.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
@ -53,6 +51,8 @@
#include "absl/types/variant.h" #include "absl/types/variant.h"
#include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/coded_stream.h"
#include "google/protobuf/util/type_resolver.h" #include "google/protobuf/util/type_resolver.h"
#include "google/protobuf/wire_format.h"
#include "google/protobuf/wire_format_lite.h"
#include "google/protobuf/stubs/status_macros.h" #include "google/protobuf/stubs/status_macros.h"
// Must be included last. // Must be included last.

Write Preview
Loading…
Cancel
Save