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

Sync from Piper @436871048

Browse Source 
PROTOBUF_SYNC_PIPER
pull/9669/head
David L. Jones 3 years ago
parent a4c9effec1 744baa96ec
commit 40db3dabf0
130 changed files with 589 additions and 538 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Makefile.am
  2. 12
      benchmarks/README.md
  3. 20
      cmake/extract_includes.bat.in
  4. 6
      cmake/install.cmake
  5. 114
      cmake/libprotoc.cmake
  6. 6
      cmake/protobuf-config.cmake.in
  7. 20
      cmake/tests.cmake
  8. 26
      java/core/src/main/java/com/google/protobuf/Descriptors.java
  9. 7
      java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
  10. 2
      protobuf_deps.bzl
  11. 14
      ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
  12. 28
      ruby/tests/basic.rb
  13. 230
      src/Makefile.am
  14. 4
      src/google/protobuf/compiler/command_line_interface.cc
  15. 22
      src/google/protobuf/compiler/command_line_interface_unittest.cc
  16. 4
      src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
  17. 6
      src/google/protobuf/compiler/cpp/enum.cc
  18. 2
      src/google/protobuf/compiler/cpp/enum.h
  19. 4
      src/google/protobuf/compiler/cpp/enum_field.cc
  20. 2
      src/google/protobuf/compiler/cpp/enum_field.h
  21. 4
      src/google/protobuf/compiler/cpp/extension.cc
  22. 2
      src/google/protobuf/compiler/cpp/extension.h
  23. 14
      src/google/protobuf/compiler/cpp/field.cc
  24. 4
      src/google/protobuf/compiler/cpp/field.h
  25. 14
      src/google/protobuf/compiler/cpp/file.cc
  26. 6
      src/google/protobuf/compiler/cpp/file.h
  27. 6
      src/google/protobuf/compiler/cpp/generator.cc
  28. 0
      src/google/protobuf/compiler/cpp/generator.h
  29. 6
      src/google/protobuf/compiler/cpp/helpers.cc
  30. 4
      src/google/protobuf/compiler/cpp/helpers.h
  31. 4
      src/google/protobuf/compiler/cpp/map_field.cc
  32. 4
      src/google/protobuf/compiler/cpp/map_field.h
  33. 14
      src/google/protobuf/compiler/cpp/message.cc
  34. 10
      src/google/protobuf/compiler/cpp/message.h
  35. 4
      src/google/protobuf/compiler/cpp/message_field.cc
  36. 4
      src/google/protobuf/compiler/cpp/message_field.h
  37. 2
      src/google/protobuf/compiler/cpp/message_layout_helper.h
  38. 4
      src/google/protobuf/compiler/cpp/metadata_test.cc
  39. 0
      src/google/protobuf/compiler/cpp/move_unittest.cc
  40. 0
      src/google/protobuf/compiler/cpp/names.h
  41. 0
      src/google/protobuf/compiler/cpp/options.h
  42. 4
      src/google/protobuf/compiler/cpp/padding_optimizer.cc
  43. 2
      src/google/protobuf/compiler/cpp/padding_optimizer.h
  44. 4
      src/google/protobuf/compiler/cpp/parse_function_generator.cc
  45. 4
      src/google/protobuf/compiler/cpp/parse_function_generator.h
  46. 2
      src/google/protobuf/compiler/cpp/plugin_unittest.cc
  47. 4
      src/google/protobuf/compiler/cpp/primitive_field.cc
  48. 2
      src/google/protobuf/compiler/cpp/primitive_field.h
  49. 4
      src/google/protobuf/compiler/cpp/service.cc
  50. 2
      src/google/protobuf/compiler/cpp/service.h
  51. 4
      src/google/protobuf/compiler/cpp/string_field.cc
  52. 2
      src/google/protobuf/compiler/cpp/string_field.h
  53. 0
      src/google/protobuf/compiler/cpp/test_bad_identifiers.proto
  54. 0
      src/google/protobuf/compiler/cpp/test_large_enum_value.proto
  55. 4
      src/google/protobuf/compiler/cpp/unittest.cc
  56. 0
      src/google/protobuf/compiler/cpp/unittest.h
  57. 12
      src/google/protobuf/compiler/cpp/unittest.inc
  58. 8
      src/google/protobuf/compiler/java/context.cc
  59. 2
      src/google/protobuf/compiler/java/context.h
  60. 2
      src/google/protobuf/compiler/java/doc_comment.cc
  61. 0
      src/google/protobuf/compiler/java/doc_comment.h
  62. 2
      src/google/protobuf/compiler/java/doc_comment_unittest.cc
  63. 10
      src/google/protobuf/compiler/java/enum.cc
  64. 0
      src/google/protobuf/compiler/java/enum.h
  65. 10
      src/google/protobuf/compiler/java/enum_field.cc
  66. 2
      src/google/protobuf/compiler/java/enum_field.h
  67. 10
      src/google/protobuf/compiler/java/enum_field_lite.cc
  68. 2
      src/google/protobuf/compiler/java/enum_field_lite.h
  69. 10
      src/google/protobuf/compiler/java/enum_lite.cc
  70. 0
      src/google/protobuf/compiler/java/enum_lite.h
  71. 10
      src/google/protobuf/compiler/java/extension.cc
  72. 0
      src/google/protobuf/compiler/java/extension.h
  73. 10
      src/google/protobuf/compiler/java/extension_lite.cc
  74. 2
      src/google/protobuf/compiler/java/extension_lite.h
  75. 26
      src/google/protobuf/compiler/java/field.cc
  76. 0
      src/google/protobuf/compiler/java/field.h
  77. 22
      src/google/protobuf/compiler/java/file.cc
  78. 2
      src/google/protobuf/compiler/java/file.h
  79. 14
      src/google/protobuf/compiler/java/generator.cc
  80. 0
      src/google/protobuf/compiler/java/generator.h
  81. 20
      src/google/protobuf/compiler/java/generator_factory.cc
  82. 0
      src/google/protobuf/compiler/java/generator_factory.h
  83. 6
      src/google/protobuf/compiler/java/helpers.cc
  84. 2
      src/google/protobuf/compiler/java/helpers.h
  85. 10
      src/google/protobuf/compiler/java/kotlin_generator.cc
  86. 0
      src/google/protobuf/compiler/java/kotlin_generator.h
  87. 10
      src/google/protobuf/compiler/java/map_field.cc
  88. 2
      src/google/protobuf/compiler/java/map_field.h
  89. 10
      src/google/protobuf/compiler/java/map_field_lite.cc
  90. 2
      src/google/protobuf/compiler/java/map_field_lite.h
  91. 20
      src/google/protobuf/compiler/java/message.cc
  92. 2
      src/google/protobuf/compiler/java/message.h
  93. 16
      src/google/protobuf/compiler/java/message_builder.cc
  94. 2
      src/google/protobuf/compiler/java/message_builder.h
  95. 16
      src/google/protobuf/compiler/java/message_builder_lite.cc
  96. 2
      src/google/protobuf/compiler/java/message_builder_lite.h
  97. 10
      src/google/protobuf/compiler/java/message_field.cc
  98. 2
      src/google/protobuf/compiler/java/message_field.h
  99. 10
      src/google/protobuf/compiler/java/message_field_lite.cc
  100. 2
      src/google/protobuf/compiler/java/message_field_lite.h
  101. Some files were not shown because too many files have changed in this diff Show More

4
Makefile.am
Unescape View File

@ -837,6 +837,7 @@ php_EXTRA_DIST= \
php/ext/google/protobuf/package.xml \
php/ext/google/protobuf/php-upb.c \
php/ext/google/protobuf/php-upb.h \
php/ext/google/protobuf/php_protobuf.h \
php/ext/google/protobuf/protobuf.c \
php/ext/google/protobuf/protobuf.h \
php/ext/google/protobuf/wkt.inc \
@ -1113,6 +1114,8 @@ python_EXTRA_DIST= \
python/google/protobuf/pyext/repeated_scalar_container.h \
python/google/protobuf/pyext/safe_numerics.h \
python/google/protobuf/pyext/scoped_pyobject_ptr.h \
python/google/protobuf/pyext/unknown_field_set.cc \
python/google/protobuf/pyext/unknown_field_set.h \
python/google/protobuf/python_protobuf.h \
python/google/protobuf/reflection.py \
python/google/protobuf/service.py \
@ -1120,6 +1123,7 @@ python_EXTRA_DIST= \
python/google/protobuf/symbol_database.py \
python/google/protobuf/text_encoding.py \
python/google/protobuf/text_format.py \
python/google/protobuf/unknown_fields.py \
python/google/protobuf/util/__init__.py \
python/release.sh \
python/mox.py \

12
benchmarks/README.md
Unescape View File

@ -69,18 +69,6 @@ solution. It requires the .NET Core SDK, and depends on
[BenchmarkDotNet](https://github.com/dotnet/BenchmarkDotNet), which
will be downloaded automatically.
### Big data
There's some optional big testing data which is not included in the directory
initially, you need to run the following command to download the testing data:
```
$ ./download_data.sh
```
After doing this the big data file will automatically generated in the
benchmark directory.
## Run instructions
To run all the benchmark dataset:

20
cmake/extract_includes.bat.in
Unescape View File

@ -22,18 +22,18 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\arenastring.h" include\g
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\arenaz_sampler.h" include\google\protobuf\arenaz_sampler.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\code_generator.h" include\google\protobuf\compiler\code_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\command_line_interface.h" include\google\protobuf\compiler\command_line_interface.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\cpp_file.h" include\google\protobuf\compiler\cpp\cpp_file.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\cpp_generator.h" include\google\protobuf\compiler\cpp\cpp_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\cpp_helpers.h" include\google\protobuf\compiler\cpp\cpp_helpers.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\cpp_names.h" include\google\protobuf\compiler\cpp\cpp_names.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\file.h" include\google\protobuf\compiler\cpp\cpp_file.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\generator.h" include\google\protobuf\compiler\cpp\cpp_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\helpers.h" include\google\protobuf\compiler\cpp\cpp_helpers.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\cpp\names.h" include\google\protobuf\compiler\cpp\cpp_names.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\csharp\csharp_doc_comment.h" include\google\protobuf\compiler\csharp\csharp_doc_comment.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\csharp\csharp_generator.h" include\google\protobuf\compiler\csharp\csharp_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\csharp\csharp_names.h" include\google\protobuf\compiler\csharp\csharp_names.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\csharp\csharp_options.h" include\google\protobuf\compiler\csharp\csharp_options.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\importer.h" include\google\protobuf\compiler\importer.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\java_generator.h" include\google\protobuf\compiler\java\java_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\java_kotlin_generator.h" include\google\protobuf\compiler\java\java_kotlin_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\java_names.h" include\google\protobuf\compiler\java\java_names.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\generator.h" include\google\protobuf\compiler\java\java_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\kotlin_generator.h" include\google\protobuf\compiler\java\java_kotlin_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\java\names.h" include\google\protobuf\compiler\java\java_names.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\js\js_generator.h" include\google\protobuf\compiler\js\js_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\objectivec\objectivec_generator.h" include\google\protobuf\compiler\objectivec\objectivec_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\objectivec\objectivec_helpers.h" include\google\protobuf\compiler\objectivec\objectivec_helpers.h
@ -41,9 +41,9 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\parser.h" inclu
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\php\php_generator.h" include\google\protobuf\compiler\php\php_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\plugin.h" include\google\protobuf\compiler\plugin.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\plugin.pb.h" include\google\protobuf\compiler\plugin.pb.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\python_generator.h" include\google\protobuf\compiler\python\python_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\python_pyi_generator.h" include\google\protobuf\compiler\python\python_pyi_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\python_helpers.h" include\google\protobuf\compiler\python\python_helpers.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\generator.h" include\google\protobuf\compiler\python\python_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\pyi_generator.h" include\google\protobuf\compiler\python\python_pyi_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\python\helpers.h" include\google\protobuf\compiler\python\python_helpers.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\compiler\ruby\ruby_generator.h" include\google\protobuf\compiler\ruby\ruby_generator.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\descriptor.h" include\google\protobuf\descriptor.h
copy "${PROTOBUF_SOURCE_WIN32_PATH}\src\google\protobuf\descriptor.pb.h" include\google\protobuf\descriptor.pb.h

6
cmake/install.cmake
Unescape View File

@ -51,7 +51,7 @@ foreach(_extract_string ${_extract_strings})
string(REPLACE "\\" "/" _header ${_header})
get_filename_component(_extract_from "${protobuf_SOURCE_DIR}/src/${_header}" ABSOLUTE)
get_filename_component(_extract_name ${_header} NAME)
get_filename_component(_extract_to "${CMAKE_INSTALL_INCLUDEDIR}/${_header}" PATH)
get_filename_component(_extract_to "${CMAKE_INSTALL_INCLUDEDIR}/${_header}" DIRECTORY)
if(EXISTS "${_extract_from}")
install(FILES "${_extract_from}"
DESTINATION "${_extract_to}"
@ -88,10 +88,10 @@ _protobuf_auto_list("${protobuf_SOURCE_DIR}/src/Makefile.am" nobase_dist_proto_D
foreach(_file ${nobase_dist_proto_DATA})
get_filename_component(_file_from "${protobuf_SOURCE_DIR}/src/${_file}" ABSOLUTE)
get_filename_component(_file_name ${_file} NAME)
get_filename_component(_file_path ${_file} PATH)
get_filename_component(_dir ${_file} DIRECTORY)
if(EXISTS "${_file_from}")
install(FILES "${_file_from}"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${_file_path}"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${_dir}"
COMPONENT protobuf-protos
RENAME "${_file_name}")
else()

114
cmake/libprotoc.cmake
Unescape View File

@ -1,21 +1,21 @@
set(libprotoc_files
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_enum.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_enum_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_extension.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_file.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_helpers.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_map_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_message.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_message_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_padding_optimizer.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_service.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_string_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/enum.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/enum_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/extension.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/file.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/helpers.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/map_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/padding_optimizer.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/parse_function_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/primitive_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/service.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/string_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum_field.cc
@ -32,36 +32,36 @@ set(libprotoc_files
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_context.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_doc_comment.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum_field.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_enum_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_extension.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_extension_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_file.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_generator_factory.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_helpers.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_kotlin_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_map_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_map_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_builder.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_builder_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_message_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_name_resolver.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_primitive_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_primitive_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_service.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_shared_code_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_string_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_string_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/context.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/extension.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/extension_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/file.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator_factory.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/map_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/map_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_builder.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_builder_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/name_resolver.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/primitive_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/primitive_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/service.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/shared_code_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/string_field.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/string_field_lite.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/js/js_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/js/well_known_types_embed.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_enum.cc
@ -90,9 +90,9 @@ set(libprotoc_files
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.pb.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_helpers.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_pyi_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/helpers.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/subprocess.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.cc
@ -102,24 +102,24 @@ set(libprotoc_files
set(libprotoc_headers
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_file.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_helpers.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/file.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/helpers.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_doc_comment.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_options.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_kotlin_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/names.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/js/js_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_pyi_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.h
)

6
cmake/protobuf-config.cmake.in
Unescape View File

@ -84,10 +84,10 @@ function(protobuf_generate)
# Create an include path for each file specified
foreach(_file ${protobuf_generate_PROTOS})
get_filename_component(_abs_file ${_file} ABSOLUTE)
get_filename_component(_abs_path ${_abs_file} PATH)
list(FIND _protobuf_include_path ${_abs_path} _contains_already)
get_filename_component(_abs_dir ${_abs_file} DIRECTORY)
list(FIND _protobuf_include_path ${_abs_dir} _contains_already)
if(${_contains_already} EQUAL -1)
list(APPEND _protobuf_include_path -I ${_abs_path})
list(APPEND _protobuf_include_path -I ${_abs_dir})
endif()
endforeach()
endif()

20
cmake/tests.cmake
Unescape View File

@ -46,8 +46,8 @@ set(lite_test_protos
set(tests_protos
google/protobuf/any_test.proto
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto
google/protobuf/compiler/cpp/test_bad_identifiers.proto
google/protobuf/compiler/cpp/test_large_enum_value.proto
google/protobuf/map_proto2_unittest.proto
google/protobuf/map_unittest.proto
google/protobuf/unittest.proto
@ -144,20 +144,20 @@ set(tests_files
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.h
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_move_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_unittest.inc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/metadata_test.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/move_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/plugin_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/unittest.inc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/importer_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_doc_comment_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_plugin_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/plugin_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/parser_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_plugin_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/plugin_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_database_unittest.cc
${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_unittest.cc

26
java/core/src/main/java/com/google/protobuf/Descriptors.java
Unescape View File

@ -814,7 +814,7 @@ public final class Descriptors {
/**
* Finds a nested message type by name.
*
* @param name The unqualified name of the nested type (e.g. "Foo").
* @param name The unqualified name of the nested type such as "Foo"
* @return The types's descriptor, or {@code null} if not found.
*/
public Descriptor findNestedTypeByName(final String name) {
@ -829,7 +829,7 @@ public final class Descriptors {
/**
* Finds a nested enum type by name.
*
* @param name The unqualified name of the nested type (e.g. "Foo").
* @param name The unqualified name of the nested type such as "Foo"
* @return The types's descriptor, or {@code null} if not found.
*/
public EnumDescriptor findEnumTypeByName(final String name) {
@ -1202,7 +1202,7 @@ public final class Descriptors {
}
}
/** Can this field be packed? i.e. is it a repeated primitive field? */
/** Can this field be packed? That is, is it a repeated primitive field? */
public boolean isPackable() {
return isRepeated() && getLiteType().isPackable();
}
@ -1332,11 +1332,11 @@ public final class Descriptors {
/**
* Compare with another {@code FieldDescriptor}. This orders fields in "canonical" order, which
* simply means ascending order by field number. {@code other} must be a field of the same type
* -- i.e. {@code getContainingType()} must return the same {@code Descriptor} for both fields.
* simply means ascending order by field number. {@code other} must be a field of the same type.
* That is, {@code getContainingType()} must return the same {@code Descriptor} for both fields.
*
* @return negative, zero, or positive if {@code this} is less than, equal to, or greater than
* {@code other}, respectively.
* {@code other}, respectively
*/
@Override
public int compareTo(final FieldDescriptor other) {
@ -1791,8 +1791,8 @@ public final class Descriptors {
/**
* Find an enum value by name.
*
* @param name The unqualified name of the value (e.g. "FOO").
* @return the value's descriptor, or {@code null} if not found.
* @param name the unqualified name of the value such as "FOO"
* @return the value's descriptor, or {@code null} if not found
*/
public EnumValueDescriptor findValueByName(final String name) {
final GenericDescriptor result = file.pool.findSymbol(fullName + '.' + name);
@ -2102,8 +2102,8 @@ public final class Descriptors {
/**
* Find a method by name.
*
* @param name The unqualified name of the method (e.g. "Foo").
* @return the method's descriptor, or {@code null} if not found.
* @param name the unqualified name of the method such as "Foo"
* @return the method's descriptor, or {@code null} if not found
*/
public MethodDescriptor findMethodByName(final String name) {
final GenericDescriptor result = file.pool.findSymbol(fullName + '.' + name);
@ -2676,8 +2676,8 @@ public final class Descriptors {
}
/**
* Verifies that the descriptor's name is valid (i.e. it contains only letters, digits, and
* underscores, and does not start with a digit).
* Verifies that the descriptor's name is valid. That is, it contains only letters, digits, and
* underscores, and does not start with a digit.
*/
static void validateSymbolName(final GenericDescriptor descriptor)
throws DescriptorValidationException {
@ -2705,7 +2705,7 @@ public final class Descriptors {
}
}
/** Describes an oneof of a message type. */
/** Describes a oneof of a message type. */
public static final class OneofDescriptor extends GenericDescriptor {
/** Get the index of this descriptor within its parent. */
public int getIndex() {

7
java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
Unescape View File

@ -295,9 +295,9 @@ public class JsonFormat {
/**
* Create a new {@link Printer} that will omit all insignificant whitespace in the JSON output.
* Create a new {@link Printer} that omits insignificant whitespace in the JSON output.
* This new Printer clones all other configurations from the current Printer. Insignificant
* whitespace is defined by the JSON spec as whitespace that appear between JSON structural
* whitespace is defined by the JSON spec as whitespace that appears between JSON structural
* elements:
*
* <pre>
@ -308,8 +308,7 @@ public class JsonFormat {
* %x0D ) ; Carriage return
* </pre>
*
* See <a href="https://tools.ietf.org/html/rfc7159">https://tools.ietf.org/html/rfc7159</a>
* current {@link Printer}.
* See <a href="https://tools.ietf.org/html/rfc7159">https://tools.ietf.org/html/rfc7159</a>.
*/
public Printer omittingInsignificantWhitespace() {
return new Printer(

2
protobuf_deps.bzl
Unescape View File

@ -10,7 +10,7 @@ PROTOBUF_MAVEN_ARTIFACTS = [
"com.google.guava:guava:30.1.1-jre",
"com.google.guava:guava-testlib:30.1.1-jre",
"com.google.truth:truth:1.1.2",
"junit:junit:4.12",
"junit:junit:4.13.2",
"org.mockito:mockito-core:4.3.1",
]

14
ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
Unescape View File

@ -62,6 +62,9 @@ import java.util.List;
import java.util.Map;
public class RubyMessage extends RubyObject {
private final String DEFAULT_VALUE = "google.protobuf.FieldDescriptorProto.default_value";
private final String TYPE = "type";
public RubyMessage(Ruby runtime, RubyClass klazz, Descriptor descriptor) {
super(runtime, klazz);
@ -677,6 +680,8 @@ public class RubyMessage extends RubyObject {
throw context.runtime.newRuntimeError("Recursion limit exceeded during encoding.");
}
RubySymbol typeBytesSymbol = RubySymbol.newSymbol(context.runtime, "TYPE_BYTES");
// Handle the typical case where the fields.keySet contain the fieldDescriptors
for (FieldDescriptor fieldDescriptor : fields.keySet()) {
IRubyObject value = fields.get(fieldDescriptor);
@ -707,14 +712,13 @@ public class RubyMessage extends RubyObject {
* stringDefaultValue}.
*/
boolean isDefaultStringForBytes = false;
if (DEFAULT_VALUE.equals(fieldDescriptor.getFullName())) {
FieldDescriptor enumFieldDescriptorForType =
this.builder.getDescriptorForType().findFieldByName("type");
String type = enumFieldDescriptorForType == null ?
null : fields.get(enumFieldDescriptorForType).toString();
if (type != null && type.equals("TYPE_BYTES") &&
fieldDescriptor.getFullName().equals("google.protobuf.FieldDescriptorProto.default_value")) {
this.builder.getDescriptorForType().findFieldByName(TYPE);
if (typeBytesSymbol.equals(fields.get(enumFieldDescriptorForType))) {
isDefaultStringForBytes = true;
}
}
builder.setField(fieldDescriptor, convert(context, fieldDescriptor, value, depth, recursionLimit, isDefaultStringForBytes));
}
}

28
ruby/tests/basic.rb
Unescape View File

@ -79,6 +79,34 @@ module BasicTest
assert_equal 8, msg.id
end
def test_issue_9507
pool = Google::Protobuf::DescriptorPool.new
pool.build do
add_message "NpeMessage" do
optional :type, :enum, 1, "TestEnum"
optional :other, :string, 2
end
add_enum "TestEnum" do
value :Something, 0
end
end
msgclass = pool.lookup("NpeMessage").msgclass
m = msgclass.new(
other: "foo" # must be set, but can be blank
)
begin
encoded = msgclass.encode(m)
rescue java.lang.NullPointerException => e
flunk "NPE rescued"
end
decoded = msgclass.decode(encoded)
decoded.inspect
decoded.to_proto
end
def test_has_field
m = TestSingularFields.new
assert !m.has_singular_msg?

230
src/Makefile.am
Unescape View File

@ -74,18 +74,18 @@ nobase_include_HEADERS = \
google/protobuf/arenaz_sampler.h \
google/protobuf/compiler/code_generator.h \
google/protobuf/compiler/command_line_interface.h \
google/protobuf/compiler/cpp/cpp_file.h \
google/protobuf/compiler/cpp/cpp_generator.h \
google/protobuf/compiler/cpp/cpp_helpers.h \
google/protobuf/compiler/cpp/cpp_names.h \
google/protobuf/compiler/cpp/file.h \
google/protobuf/compiler/cpp/generator.h \
google/protobuf/compiler/cpp/helpers.h \
google/protobuf/compiler/cpp/names.h \
google/protobuf/compiler/csharp/csharp_doc_comment.h \
google/protobuf/compiler/csharp/csharp_generator.h \
google/protobuf/compiler/csharp/csharp_names.h \
google/protobuf/compiler/csharp/csharp_options.h \
google/protobuf/compiler/importer.h \
google/protobuf/compiler/java/java_generator.h \
google/protobuf/compiler/java/java_kotlin_generator.h \
google/protobuf/compiler/java/java_names.h \
google/protobuf/compiler/java/generator.h \
google/protobuf/compiler/java/kotlin_generator.h \
google/protobuf/compiler/java/names.h \
google/protobuf/compiler/js/js_generator.h \
google/protobuf/compiler/objectivec/objectivec_generator.h \
google/protobuf/compiler/objectivec/objectivec_helpers.h \
@ -93,8 +93,8 @@ nobase_include_HEADERS = \
google/protobuf/compiler/php/php_generator.h \
google/protobuf/compiler/plugin.h \
google/protobuf/compiler/plugin.pb.h \
google/protobuf/compiler/python/python_generator.h \
google/protobuf/compiler/python/python_pyi_generator.h \
google/protobuf/compiler/python/generator.h \
google/protobuf/compiler/python/pyi_generator.h \
google/protobuf/compiler/ruby/ruby_generator.h \
google/protobuf/descriptor.h \
google/protobuf/descriptor.pb.h \
@ -325,35 +325,35 @@ endif
libprotoc_la_SOURCES = \
google/protobuf/compiler/code_generator.cc \
google/protobuf/compiler/command_line_interface.cc \
google/protobuf/compiler/cpp/cpp_enum.cc \
google/protobuf/compiler/cpp/cpp_enum.h \
google/protobuf/compiler/cpp/cpp_enum_field.cc \
google/protobuf/compiler/cpp/cpp_enum_field.h \
google/protobuf/compiler/cpp/cpp_extension.cc \
google/protobuf/compiler/cpp/cpp_extension.h \
google/protobuf/compiler/cpp/cpp_field.cc \
google/protobuf/compiler/cpp/cpp_field.h \
google/protobuf/compiler/cpp/cpp_file.cc \
google/protobuf/compiler/cpp/cpp_generator.cc \
google/protobuf/compiler/cpp/cpp_helpers.cc \
google/protobuf/compiler/cpp/cpp_map_field.cc \
google/protobuf/compiler/cpp/cpp_map_field.h \
google/protobuf/compiler/cpp/cpp_message.cc \
google/protobuf/compiler/cpp/cpp_message.h \
google/protobuf/compiler/cpp/cpp_message_field.cc \
google/protobuf/compiler/cpp/cpp_message_field.h \
google/protobuf/compiler/cpp/cpp_message_layout_helper.h \
google/protobuf/compiler/cpp/cpp_options.h \
google/protobuf/compiler/cpp/cpp_padding_optimizer.cc \
google/protobuf/compiler/cpp/cpp_padding_optimizer.h \
google/protobuf/compiler/cpp/cpp_parse_function_generator.cc \
google/protobuf/compiler/cpp/cpp_parse_function_generator.h \
google/protobuf/compiler/cpp/cpp_primitive_field.cc \
google/protobuf/compiler/cpp/cpp_primitive_field.h \
google/protobuf/compiler/cpp/cpp_service.cc \
google/protobuf/compiler/cpp/cpp_service.h \
google/protobuf/compiler/cpp/cpp_string_field.cc \
google/protobuf/compiler/cpp/cpp_string_field.h \
google/protobuf/compiler/cpp/enum.cc \
google/protobuf/compiler/cpp/enum.h \
google/protobuf/compiler/cpp/enum_field.cc \
google/protobuf/compiler/cpp/enum_field.h \
google/protobuf/compiler/cpp/extension.cc \
google/protobuf/compiler/cpp/extension.h \
google/protobuf/compiler/cpp/field.cc \
google/protobuf/compiler/cpp/field.h \
google/protobuf/compiler/cpp/file.cc \
google/protobuf/compiler/cpp/generator.cc \
google/protobuf/compiler/cpp/helpers.cc \
google/protobuf/compiler/cpp/map_field.cc \
google/protobuf/compiler/cpp/map_field.h \
google/protobuf/compiler/cpp/message.cc \
google/protobuf/compiler/cpp/message.h \
google/protobuf/compiler/cpp/message_field.cc \
google/protobuf/compiler/cpp/message_field.h \
google/protobuf/compiler/cpp/message_layout_helper.h \
google/protobuf/compiler/cpp/options.h \
google/protobuf/compiler/cpp/padding_optimizer.cc \
google/protobuf/compiler/cpp/padding_optimizer.h \
google/protobuf/compiler/cpp/parse_function_generator.cc \
google/protobuf/compiler/cpp/parse_function_generator.h \
google/protobuf/compiler/cpp/primitive_field.cc \
google/protobuf/compiler/cpp/primitive_field.h \
google/protobuf/compiler/cpp/service.cc \
google/protobuf/compiler/cpp/service.h \
google/protobuf/compiler/cpp/string_field.cc \
google/protobuf/compiler/cpp/string_field.h \
google/protobuf/compiler/csharp/csharp_doc_comment.cc \
google/protobuf/compiler/csharp/csharp_enum.cc \
google/protobuf/compiler/csharp/csharp_enum.h \
@ -384,63 +384,63 @@ libprotoc_la_SOURCES = \
google/protobuf/compiler/csharp/csharp_source_generator_base.h \
google/protobuf/compiler/csharp/csharp_wrapper_field.cc \
google/protobuf/compiler/csharp/csharp_wrapper_field.h \
google/protobuf/compiler/java/java_context.cc \
google/protobuf/compiler/java/java_context.h \
google/protobuf/compiler/java/java_doc_comment.cc \
google/protobuf/compiler/java/java_doc_comment.h \
google/protobuf/compiler/java/java_enum.cc \
google/protobuf/compiler/java/java_enum.h \
google/protobuf/compiler/java/java_enum_field.cc \
google/protobuf/compiler/java/java_enum_field.h \
google/protobuf/compiler/java/java_enum_field_lite.cc \
google/protobuf/compiler/java/java_enum_field_lite.h \
google/protobuf/compiler/java/java_enum_lite.cc \
google/protobuf/compiler/java/java_enum_lite.h \
google/protobuf/compiler/java/java_extension.cc \
google/protobuf/compiler/java/java_extension.h \
google/protobuf/compiler/java/java_extension_lite.cc \
google/protobuf/compiler/java/java_extension_lite.h \
google/protobuf/compiler/java/java_field.cc \
google/protobuf/compiler/java/java_field.h \
google/protobuf/compiler/java/java_file.cc \
google/protobuf/compiler/java/java_file.h \
google/protobuf/compiler/java/java_generator.cc \
google/protobuf/compiler/java/java_generator_factory.cc \
google/protobuf/compiler/java/java_generator_factory.h \
google/protobuf/compiler/java/java_helpers.cc \
google/protobuf/compiler/java/java_helpers.h \
google/protobuf/compiler/java/java_kotlin_generator.cc \
google/protobuf/compiler/java/java_map_field.cc \
google/protobuf/compiler/java/java_map_field.h \
google/protobuf/compiler/java/java_map_field_lite.cc \
google/protobuf/compiler/java/java_map_field_lite.h \
google/protobuf/compiler/java/java_message.cc \
google/protobuf/compiler/java/java_message.h \
google/protobuf/compiler/java/java_message_builder.cc \
google/protobuf/compiler/java/java_message_builder.h \
google/protobuf/compiler/java/java_message_builder_lite.cc \
google/protobuf/compiler/java/java_message_builder_lite.h \
google/protobuf/compiler/java/java_message_field.cc \
google/protobuf/compiler/java/java_message_field.h \
google/protobuf/compiler/java/java_message_field_lite.cc \
google/protobuf/compiler/java/java_message_field_lite.h \
google/protobuf/compiler/java/java_message_lite.cc \
google/protobuf/compiler/java/java_message_lite.h \
google/protobuf/compiler/java/java_name_resolver.cc \
google/protobuf/compiler/java/java_name_resolver.h \
google/protobuf/compiler/java/java_options.h \
google/protobuf/compiler/java/java_primitive_field.cc \
google/protobuf/compiler/java/java_primitive_field.h \
google/protobuf/compiler/java/java_primitive_field_lite.cc \
google/protobuf/compiler/java/java_primitive_field_lite.h \
google/protobuf/compiler/java/java_service.cc \
google/protobuf/compiler/java/java_service.h \
google/protobuf/compiler/java/java_shared_code_generator.cc \
google/protobuf/compiler/java/java_shared_code_generator.h \
google/protobuf/compiler/java/java_string_field.cc \
google/protobuf/compiler/java/java_string_field.h \
google/protobuf/compiler/java/java_string_field_lite.cc \
google/protobuf/compiler/java/java_string_field_lite.h \
google/protobuf/compiler/java/context.cc \
google/protobuf/compiler/java/context.h \
google/protobuf/compiler/java/doc_comment.cc \
google/protobuf/compiler/java/doc_comment.h \
google/protobuf/compiler/java/enum.cc \
google/protobuf/compiler/java/enum.h \
google/protobuf/compiler/java/enum_field.cc \
google/protobuf/compiler/java/enum_field.h \
google/protobuf/compiler/java/enum_field_lite.cc \
google/protobuf/compiler/java/enum_field_lite.h \
google/protobuf/compiler/java/enum_lite.cc \
google/protobuf/compiler/java/enum_lite.h \
google/protobuf/compiler/java/extension.cc \
google/protobuf/compiler/java/extension.h \
google/protobuf/compiler/java/extension_lite.cc \
google/protobuf/compiler/java/extension_lite.h \
google/protobuf/compiler/java/field.cc \
google/protobuf/compiler/java/field.h \
google/protobuf/compiler/java/file.cc \
google/protobuf/compiler/java/file.h \
google/protobuf/compiler/java/generator.cc \
google/protobuf/compiler/java/generator_factory.cc \
google/protobuf/compiler/java/generator_factory.h \
google/protobuf/compiler/java/helpers.cc \
google/protobuf/compiler/java/helpers.h \
google/protobuf/compiler/java/kotlin_generator.cc \
google/protobuf/compiler/java/map_field.cc \
google/protobuf/compiler/java/map_field.h \
google/protobuf/compiler/java/map_field_lite.cc \
google/protobuf/compiler/java/map_field_lite.h \
google/protobuf/compiler/java/message.cc \
google/protobuf/compiler/java/message.h \
google/protobuf/compiler/java/message_builder.cc \
google/protobuf/compiler/java/message_builder.h \
google/protobuf/compiler/java/message_builder_lite.cc \
google/protobuf/compiler/java/message_builder_lite.h \
google/protobuf/compiler/java/message_field.cc \
google/protobuf/compiler/java/message_field.h \
google/protobuf/compiler/java/message_field_lite.cc \
google/protobuf/compiler/java/message_field_lite.h \
google/protobuf/compiler/java/message_lite.cc \
google/protobuf/compiler/java/message_lite.h \
google/protobuf/compiler/java/name_resolver.cc \
google/protobuf/compiler/java/name_resolver.h \
google/protobuf/compiler/java/options.h \
google/protobuf/compiler/java/primitive_field.cc \
google/protobuf/compiler/java/primitive_field.h \
google/protobuf/compiler/java/primitive_field_lite.cc \
google/protobuf/compiler/java/primitive_field_lite.h \
google/protobuf/compiler/java/service.cc \
google/protobuf/compiler/java/service.h \
google/protobuf/compiler/java/shared_code_generator.cc \
google/protobuf/compiler/java/shared_code_generator.h \
google/protobuf/compiler/java/string_field.cc \
google/protobuf/compiler/java/string_field.h \
google/protobuf/compiler/java/string_field_lite.cc \
google/protobuf/compiler/java/string_field_lite.h \
google/protobuf/compiler/js/js_generator.cc \
google/protobuf/compiler/js/well_known_types_embed.cc \
google/protobuf/compiler/js/well_known_types_embed.h \
@ -470,10 +470,10 @@ libprotoc_la_SOURCES = \
google/protobuf/compiler/php/php_generator.cc \
google/protobuf/compiler/plugin.cc \
google/protobuf/compiler/plugin.pb.cc \
google/protobuf/compiler/python/python_generator.cc \
google/protobuf/compiler/python/python_helpers.cc \
google/protobuf/compiler/python/python_helpers.h \
google/protobuf/compiler/python/python_pyi_generator.cc \
google/protobuf/compiler/python/generator.cc \
google/protobuf/compiler/python/helpers.cc \
google/protobuf/compiler/python/helpers.h \
google/protobuf/compiler/python/pyi_generator.cc \
google/protobuf/compiler/ruby/ruby_generator.cc \
google/protobuf/compiler/scc.h \
google/protobuf/compiler/subprocess.cc \
@ -489,8 +489,8 @@ protoc_SOURCES = google/protobuf/compiler/main.cc
protoc_inputs = \
google/protobuf/any_test.proto \
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto \
google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto \
google/protobuf/compiler/cpp/test_bad_identifiers.proto \
google/protobuf/compiler/cpp/test_large_enum_value.proto \
google/protobuf/map_lite_unittest.proto \
google/protobuf/map_proto2_unittest.proto \
google/protobuf/map_unittest.proto \
@ -593,10 +593,10 @@ protoc_outputs = \
$(protoc_lite_outputs) \
google/protobuf/any_test.pb.cc \
google/protobuf/any_test.pb.h \
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc \
google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.h \
google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.cc \
google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.h \
google/protobuf/compiler/cpp/test_bad_identifiers.pb.cc \
google/protobuf/compiler/cpp/test_bad_identifiers.pb.h \
google/protobuf/compiler/cpp/test_large_enum_value.pb.cc \
google/protobuf/compiler/cpp/test_large_enum_value.pb.h \
google/protobuf/map_proto2_unittest.pb.cc \
google/protobuf/map_proto2_unittest.pb.h \
google/protobuf/map_unittest.pb.cc \
@ -703,7 +703,7 @@ $(protoc_outputs): unittest_proto_middleman
COMMON_TEST_SOURCES = \
$(COMMON_LITE_TEST_SOURCES) \
google/protobuf/compiler/cpp/cpp_unittest.h \
google/protobuf/compiler/cpp/unittest.h \
google/protobuf/map_test_util.h \
google/protobuf/map_test_util.inc \
google/protobuf/reflection_tester.cc \
@ -743,22 +743,22 @@ protobuf_test_SOURCES = \
google/protobuf/compiler/annotation_test_util.cc \
google/protobuf/compiler/annotation_test_util.h \
google/protobuf/compiler/command_line_interface_unittest.cc \
google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc \
google/protobuf/compiler/cpp/cpp_move_unittest.cc \
google/protobuf/compiler/cpp/cpp_plugin_unittest.cc \
google/protobuf/compiler/cpp/cpp_unittest.cc \
google/protobuf/compiler/cpp/cpp_unittest.inc \
google/protobuf/compiler/cpp/bootstrap_unittest.cc \
google/protobuf/compiler/cpp/metadata_test.cc \
google/protobuf/compiler/cpp/move_unittest.cc \
google/protobuf/compiler/cpp/plugin_unittest.cc \
google/protobuf/compiler/cpp/unittest.cc \
google/protobuf/compiler/cpp/unittest.inc \
google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc \
google/protobuf/compiler/csharp/csharp_generator_unittest.cc \
google/protobuf/compiler/importer_unittest.cc \
google/protobuf/compiler/java/java_doc_comment_unittest.cc \
google/protobuf/compiler/java/java_plugin_unittest.cc \
google/protobuf/compiler/java/doc_comment_unittest.cc \
google/protobuf/compiler/java/plugin_unittest.cc \
google/protobuf/compiler/mock_code_generator.cc \
google/protobuf/compiler/mock_code_generator.h \
google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc \
google/protobuf/compiler/parser_unittest.cc \
google/protobuf/compiler/python/python_plugin_unittest.cc \
google/protobuf/compiler/python/plugin_unittest.cc \
google/protobuf/compiler/ruby/ruby_generator_unittest.cc \
google/protobuf/descriptor_database_unittest.cc \
google/protobuf/descriptor_unittest.cc \
@ -831,7 +831,7 @@ protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
-DPROTOBUF_TEST_NO_DESCRIPTORS
protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
protobuf_lazy_descriptor_test_SOURCES = \
google/protobuf/compiler/cpp/cpp_unittest.cc \
google/protobuf/compiler/cpp/unittest.cc \
$(COMMON_TEST_SOURCES)
nodist_protobuf_lazy_descriptor_test_SOURCES = $(protoc_outputs)
$(am_protobuf_lazy_descriptor_test_OBJECTS): unittest_proto_middleman

4
src/google/protobuf/compiler/command_line_interface.cc
Unescape View File

@ -2209,6 +2209,10 @@ bool CommandLineInterface::GenerateDependencyManifestFile(
}
}
if (!descriptor_set_out_name_.empty()) {
output_filenames.push_back(descriptor_set_out_name_);
}
int fd;
do {
fd = open(dependency_out_name_.c_str(),

22
src/google/protobuf/compiler/command_line_interface_unittest.cc
Unescape View File

@ -1753,6 +1753,28 @@ TEST_F(CommandLineInterfaceTest, WriteDependencyManifestFileForAbsolutePath) {
"$tmpdir/bar.proto.MockCodeGenerator.test_generator: "
"$tmpdir/foo.proto\\\n $tmpdir/bar.proto");
}
TEST_F(CommandLineInterfaceTest,
WriteDependencyManifestFileWithDescriptorSetOut) {
CreateTempFile("foo.proto",
"syntax = \"proto2\";\n"
"message Foo {}\n");
CreateTempFile("bar.proto",
"syntax = \"proto2\";\n"
"import \"foo.proto\";\n"
"message Bar {\n"
" optional Foo foo = 1;\n"
"}\n");
Run("protocol_compiler --dependency_out=$tmpdir/manifest "
"--descriptor_set_out=$tmpdir/bar.pb --proto_path=$tmpdir bar.proto");
ExpectNoErrors();
ExpectFileContent("manifest",
"$tmpdir/bar.pb: "
"$tmpdir/foo.proto\\\n $tmpdir/bar.proto");
}
#endif // !_WIN32
TEST_F(CommandLineInterfaceTest, TestArgumentFile) {

4
src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc → src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
Unescape View File

@ -46,8 +46,8 @@
#include <google/protobuf/testing/file.h>
#include <google/protobuf/testing/file.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_generator.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/generator.h>
#include <google/protobuf/compiler/importer.h>
#include <google/protobuf/test_util2.h>
#include <google/protobuf/io/zero_copy_stream_impl.h>

6
src/google/protobuf/compiler/cpp/cpp_enum.cc → src/google/protobuf/compiler/cpp/enum.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_enum.h>
#include <google/protobuf/compiler/cpp/enum.h>
#include <cstdint>
#include <limits>
@ -40,8 +40,8 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_names.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/names.h>
namespace google {
namespace protobuf {

2
src/google/protobuf/compiler/cpp/cpp_enum.h → src/google/protobuf/compiler/cpp/enum.h
Unescape View File

@ -40,7 +40,7 @@
#include <string>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/options.h>
namespace google {
namespace protobuf {

4
src/google/protobuf/compiler/cpp/cpp_enum_field.cc → src/google/protobuf/compiler/cpp/enum_field.cc
Unescape View File

@ -32,12 +32,12 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_enum_field.h>
#include <google/protobuf/compiler/cpp/enum_field.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
namespace google {
namespace protobuf {

2
src/google/protobuf/compiler/cpp/cpp_enum_field.h → src/google/protobuf/compiler/cpp/enum_field.h
Unescape View File

@ -38,7 +38,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/cpp/cpp_field.h>
#include <google/protobuf/compiler/cpp/field.h>
namespace google {
namespace protobuf {

4
src/google/protobuf/compiler/cpp/cpp_extension.cc → src/google/protobuf/compiler/cpp/extension.cc
Unescape View File

@ -32,13 +32,13 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_extension.h>
#include <google/protobuf/compiler/cpp/extension.h>
#include <map>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/descriptor.pb.h>
namespace google {

2
src/google/protobuf/compiler/cpp/cpp_extension.h → src/google/protobuf/compiler/cpp/extension.h
Unescape View File

@ -39,7 +39,7 @@
#include <string>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/options.h>
namespace google {
namespace protobuf {

14
src/google/protobuf/compiler/cpp/cpp_field.cc → src/google/protobuf/compiler/cpp/field.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_field.h>
#include <google/protobuf/compiler/cpp/field.h>
#include <cstdint>
#include <memory>
@ -40,16 +40,16 @@
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/stubs/substitute.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_primitive_field.h>
#include <google/protobuf/compiler/cpp/cpp_string_field.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/primitive_field.h>
#include <google/protobuf/compiler/cpp/string_field.h>
#include <google/protobuf/stubs/logging.h>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/compiler/cpp/cpp_enum_field.h>
#include <google/protobuf/compiler/cpp/cpp_map_field.h>
#include <google/protobuf/compiler/cpp/cpp_message_field.h>
#include <google/protobuf/compiler/cpp/enum_field.h>
#include <google/protobuf/compiler/cpp/map_field.h>
#include <google/protobuf/compiler/cpp/message_field.h>
#include <google/protobuf/descriptor.pb.h>
namespace google {

4
src/google/protobuf/compiler/cpp/cpp_field.h → src/google/protobuf/compiler/cpp/field.h
Unescape View File

@ -41,8 +41,8 @@
#include <string>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/options.h>
namespace google {
namespace protobuf {

14
src/google/protobuf/compiler/cpp/cpp_file.cc → src/google/protobuf/compiler/cpp/file.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_file.h>
#include <google/protobuf/compiler/cpp/file.h>
#include <iostream>
#include <map>
@ -45,12 +45,12 @@
#include <google/protobuf/compiler/scc.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/cpp/cpp_enum.h>
#include <google/protobuf/compiler/cpp/cpp_extension.h>
#include <google/protobuf/compiler/cpp/cpp_field.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_message.h>
#include <google/protobuf/compiler/cpp/cpp_service.h>
#include <google/protobuf/compiler/cpp/enum.h>
#include <google/protobuf/compiler/cpp/extension.h>
#include <google/protobuf/compiler/cpp/field.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/message.h>
#include <google/protobuf/compiler/cpp/service.h>
#include <google/protobuf/descriptor.pb.h>
// Must be last.

6
src/google/protobuf/compiler/cpp/cpp_file.h → src/google/protobuf/compiler/cpp/file.h
Unescape View File

@ -42,10 +42,10 @@
#include <vector>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/compiler/cpp/cpp_field.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/field.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/scc.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/options.h>
namespace google {
namespace protobuf {

6
src/google/protobuf/compiler/cpp/cpp_generator.cc → src/google/protobuf/compiler/cpp/generator.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_generator.h>
#include <google/protobuf/compiler/cpp/generator.h>
#include <memory>
#include <string>
@ -42,8 +42,8 @@
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/io/zero_copy_stream.h>
#include <google/protobuf/compiler/cpp/cpp_file.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/file.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/descriptor.pb.h>
namespace google {

0
src/google/protobuf/compiler/cpp/cpp_generator.h → src/google/protobuf/compiler/cpp/generator.h
Unescape View File

6
src/google/protobuf/compiler/cpp/cpp_helpers.cc → src/google/protobuf/compiler/cpp/helpers.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <cstdint>
#include <functional>
@ -45,8 +45,8 @@
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/stubs/logging.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/compiler/cpp/cpp_names.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/names.h>
#include <google/protobuf/compiler/cpp/options.h>
#include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/compiler/scc.h>
#include <google/protobuf/io/printer.h>

4
src/google/protobuf/compiler/cpp/cpp_helpers.h → src/google/protobuf/compiler/cpp/helpers.h
Unescape View File

@ -43,8 +43,8 @@
#include <google/protobuf/compiler/scc.h>
#include <google/protobuf/compiler/code_generator.h>
#include <google/protobuf/compiler/cpp/cpp_names.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/names.h>
#include <google/protobuf/compiler/cpp/options.h>
#include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/descriptor.h>

4
src/google/protobuf/compiler/cpp/cpp_map_field.cc → src/google/protobuf/compiler/cpp/map_field.cc
Unescape View File

@ -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/compiler/cpp/cpp_map_field.h>
#include <google/protobuf/compiler/cpp/map_field.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
namespace google {

4
src/google/protobuf/compiler/cpp/cpp_map_field.h → src/google/protobuf/compiler/cpp/map_field.h
Unescape View File

@ -34,8 +34,8 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_message_field.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/message_field.h>
namespace google {
namespace protobuf {

14
src/google/protobuf/compiler/cpp/cpp_message.cc → src/google/protobuf/compiler/cpp/message.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_message.h>
#include <google/protobuf/compiler/cpp/message.h>
#include <algorithm>
#include <cstdint>
@ -52,12 +52,12 @@
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/stubs/substitute.h>
#include <google/protobuf/compiler/cpp/cpp_enum.h>
#include <google/protobuf/compiler/cpp/cpp_extension.h>
#include <google/protobuf/compiler/cpp/cpp_field.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_padding_optimizer.h>
#include <google/protobuf/compiler/cpp/cpp_parse_function_generator.h>
#include <google/protobuf/compiler/cpp/enum.h>
#include <google/protobuf/compiler/cpp/extension.h>
#include <google/protobuf/compiler/cpp/field.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/padding_optimizer.h>
#include <google/protobuf/compiler/cpp/parse_function_generator.h>
#include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/stubs/hash.h>

10
src/google/protobuf/compiler/cpp/cpp_message.h → src/google/protobuf/compiler/cpp/message.h
Unescape View File

@ -40,11 +40,11 @@
#include <set>
#include <string>
#include <google/protobuf/compiler/cpp/cpp_field.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_message_layout_helper.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/cpp_parse_function_generator.h>
#include <google/protobuf/compiler/cpp/field.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/message_layout_helper.h>
#include <google/protobuf/compiler/cpp/options.h>
#include <google/protobuf/compiler/cpp/parse_function_generator.h>
namespace google {
namespace protobuf {

4
src/google/protobuf/compiler/cpp/cpp_message_field.cc → src/google/protobuf/compiler/cpp/message_field.cc
Unescape View File

@ -32,10 +32,10 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_message_field.h>
#include <google/protobuf/compiler/cpp/message_field.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/stubs/strutil.h>

4
src/google/protobuf/compiler/cpp/cpp_message_field.h → src/google/protobuf/compiler/cpp/message_field.h
Unescape View File

@ -38,8 +38,8 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/cpp/cpp_field.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/field.h>
#include <google/protobuf/compiler/cpp/helpers.h>
namespace google {
namespace protobuf {

2
src/google/protobuf/compiler/cpp/cpp_message_layout_helper.h → src/google/protobuf/compiler/cpp/message_layout_helper.h
Unescape View File

@ -36,7 +36,7 @@
#define GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_LAYOUT_HELPER_H__
#include <google/protobuf/descriptor.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/options.h>
namespace google {
namespace protobuf {

4
src/google/protobuf/compiler/cpp/metadata_test.cc
Unescape View File

@ -32,8 +32,8 @@
#include <google/protobuf/testing/file.h>
#include <google/protobuf/testing/file.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_generator.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/generator.h>
#include <google/protobuf/compiler/annotation_test_util.h>
#include <google/protobuf/compiler/command_line_interface.h>
#include <google/protobuf/descriptor.pb.h>

0
src/google/protobuf/compiler/cpp/cpp_move_unittest.cc → src/google/protobuf/compiler/cpp/move_unittest.cc
Unescape View File

0
src/google/protobuf/compiler/cpp/cpp_names.h → src/google/protobuf/compiler/cpp/names.h
Unescape View File

0
src/google/protobuf/compiler/cpp/cpp_options.h → src/google/protobuf/compiler/cpp/options.h
Unescape View File

4
src/google/protobuf/compiler/cpp/cpp_padding_optimizer.cc → src/google/protobuf/compiler/cpp/padding_optimizer.cc
Unescape View File

@ -28,9 +28,9 @@
// (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/compiler/cpp/cpp_padding_optimizer.h>
#include <google/protobuf/compiler/cpp/padding_optimizer.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
namespace google {
namespace protobuf {

2
src/google/protobuf/compiler/cpp/cpp_padding_optimizer.h → src/google/protobuf/compiler/cpp/padding_optimizer.h
Unescape View File

@ -35,7 +35,7 @@
#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_PADDING_OPTIMIZER_H__
#define GOOGLE_PROTOBUF_COMPILER_CPP_PADDING_OPTIMIZER_H__
#include <google/protobuf/compiler/cpp/cpp_message_layout_helper.h>
#include <google/protobuf/compiler/cpp/message_layout_helper.h>
namespace google {
namespace protobuf {

4
src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc → src/google/protobuf/compiler/cpp/parse_function_generator.cc
Unescape View File

@ -28,7 +28,7 @@
// (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/compiler/cpp/cpp_parse_function_generator.h>
#include <google/protobuf/compiler/cpp/parse_function_generator.h>
#include <algorithm>
#include <limits>
@ -36,7 +36,7 @@
#include <utility>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
namespace google {
namespace protobuf {

4
src/google/protobuf/compiler/cpp/cpp_parse_function_generator.h → src/google/protobuf/compiler/cpp/parse_function_generator.h
Unescape View File

@ -38,8 +38,8 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/wire_format_lite.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/options.h>
namespace google {
namespace protobuf {

2
src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc → src/google/protobuf/compiler/cpp/plugin_unittest.cc
Unescape View File

@ -38,7 +38,7 @@
#include <google/protobuf/testing/file.h>
#include <google/protobuf/testing/file.h>
#include <google/protobuf/compiler/cpp/cpp_generator.h>
#include <google/protobuf/compiler/cpp/generator.h>
#include <google/protobuf/compiler/command_line_interface.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/io/zero_copy_stream.h>

4
src/google/protobuf/compiler/cpp/cpp_primitive_field.cc → src/google/protobuf/compiler/cpp/primitive_field.cc
Unescape View File

@ -32,12 +32,12 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_primitive_field.h>
#include <google/protobuf/compiler/cpp/primitive_field.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
namespace google {
namespace protobuf {

2
src/google/protobuf/compiler/cpp/cpp_primitive_field.h → src/google/protobuf/compiler/cpp/primitive_field.h
Unescape View File

@ -38,7 +38,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/cpp/cpp_field.h>
#include <google/protobuf/compiler/cpp/field.h>
namespace google {
namespace protobuf {

4
src/google/protobuf/compiler/cpp/cpp_service.cc → src/google/protobuf/compiler/cpp/service.cc
Unescape View File

@ -32,11 +32,11 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_service.h>
#include <google/protobuf/compiler/cpp/service.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
namespace google {
namespace protobuf {

2
src/google/protobuf/compiler/cpp/cpp_service.h → src/google/protobuf/compiler/cpp/service.h
Unescape View File

@ -39,7 +39,7 @@
#include <string>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/compiler/cpp/cpp_options.h>
#include <google/protobuf/compiler/cpp/options.h>
namespace google {
namespace protobuf {

4
src/google/protobuf/compiler/cpp/cpp_string_field.cc → src/google/protobuf/compiler/cpp/string_field.cc
Unescape View File

@ -32,11 +32,11 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/cpp/cpp_string_field.h>
#include <google/protobuf/compiler/cpp/string_field.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/descriptor.pb.h>

2
src/google/protobuf/compiler/cpp/cpp_string_field.h → src/google/protobuf/compiler/cpp/string_field.h
Unescape View File

@ -38,7 +38,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/cpp/cpp_field.h>
#include <google/protobuf/compiler/cpp/field.h>
namespace google {
namespace protobuf {

0
src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto → src/google/protobuf/compiler/cpp/test_bad_identifiers.proto
Unescape View File

0
src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto → src/google/protobuf/compiler/cpp/test_large_enum_value.proto
Unescape View File

4
src/google/protobuf/compiler/cpp/cpp_unittest.cc → src/google/protobuf/compiler/cpp/unittest.cc
Unescape View File

@ -44,7 +44,7 @@
// correctly and produces the interfaces we expect, which is why this test
// is written this way.
#include <google/protobuf/compiler/cpp/cpp_unittest.h>
#include <google/protobuf/compiler/cpp/unittest.h>
#include <google/protobuf/unittest.pb.h>
#include <google/protobuf/unittest_embed_optimize_for.pb.h>
@ -65,7 +65,7 @@
#define UNITTEST_IMPORT ::protobuf_unittest_import
// Must include after the above macros.
#include <google/protobuf/compiler/cpp/cpp_unittest.inc>
#include <google/protobuf/compiler/cpp/unittest.inc>
namespace google {
namespace protobuf {

0
src/google/protobuf/compiler/cpp/cpp_unittest.h → src/google/protobuf/compiler/cpp/unittest.h
Unescape View File

12
src/google/protobuf/compiler/cpp/cpp_unittest.inc → src/google/protobuf/compiler/cpp/unittest.inc
Unescape View File

@ -49,15 +49,15 @@
#include <memory>
#include <vector>
#include <google/protobuf/compiler/cpp/cpp_unittest.h>
#include <google/protobuf/compiler/cpp/unittest.h>
#include <google/protobuf/stubs/strutil.h>
#if !defined(GOOGLE_PROTOBUF_CMAKE_BUILD) && !defined(_MSC_VER)
// We exclude this large proto from cmake build because it's too large for
#ifndef _MSC_VER
// We exclude this large proto because it's too large for
// visual studio to compile (report internal errors).
#include <google/protobuf/unittest_enormous_descriptor.pb.h>
#endif
#include <google/protobuf/compiler/cpp/cpp_helpers.h>
#include <google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.h>
#include <google/protobuf/compiler/cpp/helpers.h>
#include <google/protobuf/compiler/cpp/test_bad_identifiers.pb.h>
#include <google/protobuf/compiler/scc.h>
#include <google/protobuf/compiler/importer.h>
#include <google/protobuf/test_util2.h>
@ -138,7 +138,7 @@ TEST(GENERATED_DESCRIPTOR_TEST_NAME, IdenticalDescriptors) {
generated_descriptor_proto.DebugString());
}
#if !defined(GOOGLE_PROTOBUF_CMAKE_BUILD) && !defined(_MSC_VER)
#ifndef _MSC_VER
// Test that generated code has proper descriptors:
// Touch a descriptor generated from an enormous message to validate special
// handling for descriptors exceeding the C++ standard's recommended minimum

8
src/google/protobuf/compiler/java/java_context.cc → src/google/protobuf/compiler/java/context.cc
Unescape View File

@ -28,13 +28,13 @@
// (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/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/field.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
#include <google/protobuf/stubs/map_util.h>
namespace google {

2
src/google/protobuf/compiler/java/java_context.h → src/google/protobuf/compiler/java/context.h
Unescape View File

@ -36,7 +36,7 @@
#include <vector>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/compiler/java/java_options.h>
#include <google/protobuf/compiler/java/options.h>
namespace google {
namespace protobuf {

2
src/google/protobuf/compiler/java/java_doc_comment.cc → src/google/protobuf/compiler/java/doc_comment.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <vector>

0
src/google/protobuf/compiler/java/java_doc_comment.h → src/google/protobuf/compiler/java/doc_comment.h
Unescape View File

2
src/google/protobuf/compiler/java/java_doc_comment_unittest.cc → src/google/protobuf/compiler/java/doc_comment_unittest.cc
Unescape View File

@ -30,7 +30,7 @@
// Author: kenton@google.com (Kenton Varda)
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <gtest/gtest.h>

10
src/google/protobuf/compiler/java/java_enum.cc → src/google/protobuf/compiler/java/enum.cc
Unescape View File

@ -32,17 +32,17 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_enum.h>
#include <google/protobuf/compiler/java/enum.h>
#include <map>
#include <string>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
#include <google/protobuf/descriptor.pb.h>
// Must be last.

0
src/google/protobuf/compiler/java/java_enum.h → src/google/protobuf/compiler/java/enum.h
Unescape View File

10
src/google/protobuf/compiler/java/java_enum_field.cc → src/google/protobuf/compiler/java/enum_field.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_enum_field.h>
#include <google/protobuf/compiler/java/enum_field.h>
#include <cstdint>
#include <map>
@ -43,10 +43,10 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
// Must be last.
#include <google/protobuf/port_def.inc>

2
src/google/protobuf/compiler/java/java_enum_field.h → src/google/protobuf/compiler/java/enum_field.h
Unescape View File

@ -38,7 +38,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
namespace google {
namespace protobuf {

10
src/google/protobuf/compiler/java/java_enum_field_lite.cc → src/google/protobuf/compiler/java/enum_field_lite.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_enum_field_lite.h>
#include <google/protobuf/compiler/java/enum_field_lite.h>
#include <cstdint>
#include <map>
@ -43,10 +43,10 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
// Must be last.
#include <google/protobuf/port_def.inc>

2
src/google/protobuf/compiler/java/java_enum_field_lite.h → src/google/protobuf/compiler/java/enum_field_lite.h
Unescape View File

@ -39,7 +39,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
namespace google {
namespace protobuf {

10
src/google/protobuf/compiler/java/java_enum_lite.cc → src/google/protobuf/compiler/java/enum_lite.cc
Unescape View File

@ -32,17 +32,17 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_enum_lite.h>
#include <google/protobuf/compiler/java/enum_lite.h>
#include <map>
#include <string>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
#include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/stubs/map_util.h>

0
src/google/protobuf/compiler/java/java_enum_lite.h → src/google/protobuf/compiler/java/enum_lite.h
Unescape View File

10
src/google/protobuf/compiler/java/java_extension.cc → src/google/protobuf/compiler/java/extension.cc
Unescape View File

@ -32,14 +32,14 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_extension.h>
#include <google/protobuf/compiler/java/extension.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
// Must be last.
#include <google/protobuf/port_def.inc>

0
src/google/protobuf/compiler/java/java_extension.h → src/google/protobuf/compiler/java/extension.h
Unescape View File

10
src/google/protobuf/compiler/java/java_extension_lite.cc → src/google/protobuf/compiler/java/extension_lite.cc
Unescape View File

@ -28,14 +28,14 @@
// (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/compiler/java/java_extension_lite.h>
#include <google/protobuf/compiler/java/extension_lite.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
// Must be last.
#include <google/protobuf/port_def.inc>

2
src/google/protobuf/compiler/java/java_extension_lite.h → src/google/protobuf/compiler/java/extension_lite.h
Unescape View File

@ -35,7 +35,7 @@
#include <string>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/compiler/java/java_extension.h>
#include <google/protobuf/compiler/java/extension.h>
namespace google {
namespace protobuf {

26
src/google/protobuf/compiler/java/java_field.cc → src/google/protobuf/compiler/java/field.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
#include <memory>
@ -41,18 +41,18 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/stubs/substitute.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_enum_field.h>
#include <google/protobuf/compiler/java/java_enum_field_lite.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_map_field.h>
#include <google/protobuf/compiler/java/java_map_field_lite.h>
#include <google/protobuf/compiler/java/java_message_field.h>
#include <google/protobuf/compiler/java/java_message_field_lite.h>
#include <google/protobuf/compiler/java/java_primitive_field.h>
#include <google/protobuf/compiler/java/java_primitive_field_lite.h>
#include <google/protobuf/compiler/java/java_string_field.h>
#include <google/protobuf/compiler/java/java_string_field_lite.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/enum_field.h>
#include <google/protobuf/compiler/java/enum_field_lite.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/map_field.h>
#include <google/protobuf/compiler/java/map_field_lite.h>
#include <google/protobuf/compiler/java/message_field.h>
#include <google/protobuf/compiler/java/message_field_lite.h>
#include <google/protobuf/compiler/java/primitive_field.h>
#include <google/protobuf/compiler/java/primitive_field_lite.h>
#include <google/protobuf/compiler/java/string_field.h>
#include <google/protobuf/compiler/java/string_field_lite.h>
namespace google {

0
src/google/protobuf/compiler/java/java_field.h → src/google/protobuf/compiler/java/field.h
Unescape View File

22
src/google/protobuf/compiler/java/java_file.cc → src/google/protobuf/compiler/java/file.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_file.h>
#include <google/protobuf/compiler/java/file.h>
#include <memory>
#include <set>
@ -42,16 +42,16 @@
#include <google/protobuf/io/zero_copy_stream.h>
#include <google/protobuf/dynamic_message.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_enum.h>
#include <google/protobuf/compiler/java/java_enum_lite.h>
#include <google/protobuf/compiler/java/java_extension.h>
#include <google/protobuf/compiler/java/java_generator_factory.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_message.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/java_service.h>
#include <google/protobuf/compiler/java/java_shared_code_generator.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/enum.h>
#include <google/protobuf/compiler/java/enum_lite.h>
#include <google/protobuf/compiler/java/extension.h>
#include <google/protobuf/compiler/java/generator_factory.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/message.h>
#include <google/protobuf/compiler/java/name_resolver.h>
#include <google/protobuf/compiler/java/service.h>
#include <google/protobuf/compiler/java/shared_code_generator.h>
#include <google/protobuf/descriptor.pb.h>
// Must be last.

2
src/google/protobuf/compiler/java/java_file.h → src/google/protobuf/compiler/java/file.h
Unescape View File

@ -40,7 +40,7 @@
#include <vector>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/compiler/java/java_options.h>
#include <google/protobuf/compiler/java/options.h>
namespace google {
namespace protobuf {

14
src/google/protobuf/compiler/java/java_generator.cc → src/google/protobuf/compiler/java/generator.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_generator.h>
#include <google/protobuf/compiler/java/generator.h>
#include <memory>
@ -40,12 +40,12 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/io/zero_copy_stream.h>
#include <google/protobuf/stubs/stringprintf.h>
#include <google/protobuf/compiler/java/java_file.h>
#include <google/protobuf/compiler/java/java_generator_factory.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/java_options.h>
#include <google/protobuf/compiler/java/java_shared_code_generator.h>
#include <google/protobuf/compiler/java/file.h>
#include <google/protobuf/compiler/java/generator_factory.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
#include <google/protobuf/compiler/java/options.h>
#include <google/protobuf/compiler/java/shared_code_generator.h>
#include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/stubs/strutil.h>

0
src/google/protobuf/compiler/java/java_generator.h → src/google/protobuf/compiler/java/generator.h
Unescape View File

20
src/google/protobuf/compiler/java/java_generator_factory.cc → src/google/protobuf/compiler/java/generator_factory.cc
Unescape View File

@ -30,17 +30,17 @@
// Author: liujisi@google.com (Pherl Liu)
#include <google/protobuf/compiler/java/java_generator_factory.h>
#include <google/protobuf/compiler/java/generator_factory.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_enum_field.h>
#include <google/protobuf/compiler/java/java_extension.h>
#include <google/protobuf/compiler/java/java_extension_lite.h>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_message.h>
#include <google/protobuf/compiler/java/java_message_lite.h>
#include <google/protobuf/compiler/java/java_service.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/enum_field.h>
#include <google/protobuf/compiler/java/extension.h>
#include <google/protobuf/compiler/java/extension_lite.h>
#include <google/protobuf/compiler/java/field.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/message.h>
#include <google/protobuf/compiler/java/message_lite.h>
#include <google/protobuf/compiler/java/service.h>
namespace google {
namespace protobuf {

0
src/google/protobuf/compiler/java/java_generator_factory.h → src/google/protobuf/compiler/java/generator_factory.h
Unescape View File

6
src/google/protobuf/compiler/java/java_helpers.cc → src/google/protobuf/compiler/java/helpers.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <algorithm>
#include <cstdint>
@ -44,8 +44,8 @@
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/stubs/stringprintf.h>
#include <google/protobuf/stubs/substitute.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/java_names.h>
#include <google/protobuf/compiler/java/name_resolver.h>
#include <google/protobuf/compiler/java/names.h>
#include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/stubs/hash.h> // for hash<T *>

2
src/google/protobuf/compiler/java/java_helpers.h → src/google/protobuf/compiler/java/helpers.h
Unescape View File

@ -40,7 +40,7 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/descriptor.pb.h>
namespace google {

10
src/google/protobuf/compiler/java/java_kotlin_generator.cc → src/google/protobuf/compiler/java/kotlin_generator.cc
Unescape View File

@ -28,13 +28,13 @@
// (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/compiler/java/java_kotlin_generator.h>
#include <google/protobuf/compiler/java/kotlin_generator.h>
#include <google/protobuf/compiler/code_generator.h>
#include <google/protobuf/compiler/java/java_file.h>
#include <google/protobuf/compiler/java/java_generator.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_options.h>
#include <google/protobuf/compiler/java/file.h>
#include <google/protobuf/compiler/java/generator.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/options.h>
namespace google {
namespace protobuf {

0
src/google/protobuf/compiler/java/java_kotlin_generator.h → src/google/protobuf/compiler/java/kotlin_generator.h
Unescape View File

10
src/google/protobuf/compiler/java/java_map_field.cc → src/google/protobuf/compiler/java/map_field.cc
Unescape View File

@ -28,13 +28,13 @@
// (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/compiler/java/java_map_field.h>
#include <google/protobuf/compiler/java/map_field.h>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
// Must be last.
#include <google/protobuf/port_def.inc>

2
src/google/protobuf/compiler/java/java_map_field.h → src/google/protobuf/compiler/java/map_field.h
Unescape View File

@ -31,7 +31,7 @@
#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__
#define GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
namespace google {
namespace protobuf {

10
src/google/protobuf/compiler/java/java_map_field_lite.cc → src/google/protobuf/compiler/java/map_field_lite.cc
Unescape View File

@ -28,15 +28,15 @@
// (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/compiler/java/java_map_field_lite.h>
#include <google/protobuf/compiler/java/map_field_lite.h>
#include <cstdint>
#include <google/protobuf/io/printer.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
// Must be last.
#include <google/protobuf/port_def.inc>

2
src/google/protobuf/compiler/java/java_map_field_lite.h → src/google/protobuf/compiler/java/map_field_lite.h
Unescape View File

@ -33,7 +33,7 @@
#include <cstdint>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
namespace google {
namespace protobuf {

20
src/google/protobuf/compiler/java/java_message.cc → src/google/protobuf/compiler/java/message.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_message.h>
#include <google/protobuf/compiler/java/message.h>
#include <algorithm>
#include <cstdint>
@ -45,15 +45,15 @@
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/stubs/substitute.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_enum.h>
#include <google/protobuf/compiler/java/java_extension.h>
#include <google/protobuf/compiler/java/java_generator_factory.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_message_builder.h>
#include <google/protobuf/compiler/java/java_message_builder_lite.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/enum.h>
#include <google/protobuf/compiler/java/extension.h>
#include <google/protobuf/compiler/java/generator_factory.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/message_builder.h>
#include <google/protobuf/compiler/java/message_builder_lite.h>
#include <google/protobuf/compiler/java/name_resolver.h>
#include <google/protobuf/descriptor.pb.h>
// Must be last.

2
src/google/protobuf/compiler/java/java_message.h → src/google/protobuf/compiler/java/message.h
Unescape View File

@ -38,7 +38,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
namespace google {
namespace protobuf {

16
src/google/protobuf/compiler/java/java_message_builder.cc → src/google/protobuf/compiler/java/message_builder.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_message_builder.h>
#include <google/protobuf/compiler/java/message_builder.h>
#include <algorithm>
#include <map>
@ -44,13 +44,13 @@
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/stubs/substitute.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_enum.h>
#include <google/protobuf/compiler/java/java_extension.h>
#include <google/protobuf/compiler/java/java_generator_factory.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/enum.h>
#include <google/protobuf/compiler/java/extension.h>
#include <google/protobuf/compiler/java/generator_factory.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
#include <google/protobuf/descriptor.pb.h>
// Must be last.

2
src/google/protobuf/compiler/java/java_message_builder.h → src/google/protobuf/compiler/java/message_builder.h
Unescape View File

@ -38,7 +38,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
namespace google {
namespace protobuf {

16
src/google/protobuf/compiler/java/java_message_builder_lite.cc → src/google/protobuf/compiler/java/message_builder_lite.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_message_builder_lite.h>
#include <google/protobuf/compiler/java/message_builder_lite.h>
#include <algorithm>
#include <map>
@ -44,13 +44,13 @@
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/stubs/substitute.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_enum.h>
#include <google/protobuf/compiler/java/java_extension.h>
#include <google/protobuf/compiler/java/java_generator_factory.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/enum.h>
#include <google/protobuf/compiler/java/extension.h>
#include <google/protobuf/compiler/java/generator_factory.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
#include <google/protobuf/descriptor.pb.h>
// Must be last.

2
src/google/protobuf/compiler/java/java_message_builder_lite.h → src/google/protobuf/compiler/java/message_builder_lite.h
Unescape View File

@ -38,7 +38,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
namespace google {
namespace protobuf {

10
src/google/protobuf/compiler/java/java_message_field.cc → src/google/protobuf/compiler/java/message_field.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_message_field.h>
#include <google/protobuf/compiler/java/message_field.h>
#include <map>
#include <string>
@ -40,10 +40,10 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
// Must be last.
#include <google/protobuf/port_def.inc>

2
src/google/protobuf/compiler/java/java_message_field.h → src/google/protobuf/compiler/java/message_field.h
Unescape View File

@ -38,7 +38,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
namespace google {
namespace protobuf {

10
src/google/protobuf/compiler/java/java_message_field_lite.cc → src/google/protobuf/compiler/java/message_field_lite.cc
Unescape View File

@ -32,7 +32,7 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <google/protobuf/compiler/java/java_message_field_lite.h>
#include <google/protobuf/compiler/java/message_field_lite.h>
#include <cstdint>
#include <map>
@ -41,10 +41,10 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/compiler/java/java_context.h>
#include <google/protobuf/compiler/java/java_doc_comment.h>
#include <google/protobuf/compiler/java/java_helpers.h>
#include <google/protobuf/compiler/java/java_name_resolver.h>
#include <google/protobuf/compiler/java/context.h>
#include <google/protobuf/compiler/java/doc_comment.h>
#include <google/protobuf/compiler/java/helpers.h>
#include <google/protobuf/compiler/java/name_resolver.h>
// Must be last.
#include <google/protobuf/port_def.inc>

2
src/google/protobuf/compiler/java/java_message_field_lite.h → src/google/protobuf/compiler/java/message_field_lite.h
Unescape View File

@ -39,7 +39,7 @@
#include <map>
#include <string>
#include <google/protobuf/compiler/java/java_field.h>
#include <google/protobuf/compiler/java/field.h>
namespace google {
namespace protobuf {

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save