From 9e24b1912efa67e0ade3d0feb5b37add81458090 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 9 Jun 2022 07:42:14 -0400 Subject: [PATCH] Sync from Piper @453894829 PROTOBUF_SYNC_PIPER --- .gitignore | 1 + src/file_lists.cmake | 877 ++++++++++++++++++ .../protobuf/compiler/cpp/string_field.cc | 14 +- src/google/protobuf/compiler/plugin.pb.h | 24 +- src/google/protobuf/descriptor.pb.h | 132 +-- src/google/protobuf/io/tokenizer.h | 8 +- src/google/protobuf/util/time_util_test.cc | 63 +- 7 files changed, 957 insertions(+), 162 deletions(-) create mode 100644 src/file_lists.cmake diff --git a/.gitignore b/.gitignore index 62de6f1bf9..d8b0bd3842 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ depcomp install-sh ltmain.sh missing +configure~ aclocal.m4 m4/libtool.m4 diff --git a/src/file_lists.cmake b/src/file_lists.cmake new file mode 100644 index 0000000000..620755aa29 --- /dev/null +++ b/src/file_lists.cmake @@ -0,0 +1,877 @@ +# Auto-generated by //pkg:gen_src_file_lists_cmake +# +# This file contains lists of sources based on Bazel rules. It should +# be included from a hand-written CMake file that defines targets. +# +# Changes to this file will be overwritten based on Bazel definitions. + +if(${CMAKE_VERSION} VERSION_GREATER 3.10 OR ${CMAKE_VERSION} VERSION_EQUAL 3.10) + include_guard() +endif() + +# //pkg:protobuf +set(libprotobuf_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/any.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/any.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/any_lite.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/api.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenastring.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenaz_sampler.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/importer.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/parser.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_database.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/duration.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/dynamic_message.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/empty.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set_heavy.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/field_mask.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_bases.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_reflection.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_full.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_lite.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/implicit_weak_message.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/inlined_string_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/gzip_stream.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/printer.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/strtod.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/tokenizer.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl_lite.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/map.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/message.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/message_lite.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/parse_context.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_ops.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_ptr_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/service.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/source_context.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/struct.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/bytestream.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/int128.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/statusor.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringpiece.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringprintf.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/structurally_valid.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/strutil.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/substitute.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/time.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/text_format.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/timestamp.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/type.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unknown_field_set.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/delimited_message_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_comparator.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_mask_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/datapiece.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/default_value_objectwriter.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/error_listener.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/field_mask_utility.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_escaping.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_objectwriter.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_stream_parser.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/object_writer.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/proto_writer.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectsource.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectwriter.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/type_info.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/utility.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/time_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/wrappers.pb.cc +) + +# //pkg:protobuf +set(libprotobuf_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/any.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/any.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/api.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_impl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenastring.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenaz_sampler.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/importer.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/parser.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_database.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/duration.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/dynamic_message.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/empty.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/endian.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/explicitly_constructed.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set_inl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/field_access_listener.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/field_mask.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_reflection.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_bases.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_reflection.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_decl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_impl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/has_bits.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/implicit_weak_message.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/inlined_string_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/gzip_stream.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/printer.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/strtod.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/tokenizer.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_entry.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_entry_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field_inl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_type_handler.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/message.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/message_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/metadata.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/metadata_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/parse_context.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/port.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_internal.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_ops.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_ptr_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/service.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/source_context.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/struct.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/bytestream.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/callback.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/casts.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/hash.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/int128.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/logging.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/macros.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/map_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/mathutil.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/mutex.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/once.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/platform_macros.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/port.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status_macros.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/statusor.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stl_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringpiece.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringprintf.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/strutil.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/substitute.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/template_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/time.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/text_format.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/timestamp.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/type.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unknown_field_set.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/delimited_message_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_comparator.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_mask_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/datapiece.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/default_value_objectwriter.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/error_listener.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/field_mask_utility.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_escaping.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_objectwriter.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_stream_parser.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/location_tracker.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/object_location_tracker.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/object_source.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/object_writer.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/proto_writer.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectsource.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectwriter.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/structured_objectwriter.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/type_info.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/utility.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/time_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/wrappers.pb.h +) + +# //pkg:protobuf_lite +set(libprotobuf_lite_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/any_lite.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenastring.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenaz_sampler.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_lite.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/implicit_weak_message.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/inlined_string_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl_lite.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/map.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/message_lite.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/parse_context.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_ptr_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/bytestream.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/int128.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/statusor.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringpiece.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringprintf.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/structurally_valid.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/strutil.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/time.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.cc +) + +# //pkg:protobuf_lite +set(libprotobuf_lite_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/any.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_impl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenastring.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenaz_sampler.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/endian.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/explicitly_constructed.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set_inl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_decl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_impl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/has_bits.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/implicit_weak_message.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/inlined_string_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_entry_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_type_handler.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/message_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/metadata_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/parse_context.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/port.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_ptr_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/bytestream.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/callback.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/casts.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/hash.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/int128.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/logging.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/macros.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/map_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/mathutil.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/mutex.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/once.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/platform_macros.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/port.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status_macros.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/statusor.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stl_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringpiece.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringprintf.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/strutil.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/template_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/time.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.h +) + +# //pkg:protoc +set(libprotoc_srcs + ${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/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 + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_field_base.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_generator.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_helpers.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_map_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_message.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_message_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc + ${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/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_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/objectivec/objectivec_enum.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_extension.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_file.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_generator.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_message.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_message_field.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc + ${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/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 +) + +# //pkg:protoc +set(libprotoc_hdrs + ${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/enum.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/enum_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/extension.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/field.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/map_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message_layout_helper.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/names.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/options.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/padding_optimizer.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/parse_function_generator.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/primitive_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/service.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/string_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_doc_comment.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_field_base.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_generator.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_helpers.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_map_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_message.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_message_field.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/csharp/csharp_primitive_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_reflection_class.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_source_generator_base.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_wrapper_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/context.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/extension.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/extension_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/file.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator_factory.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/map_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/map_field_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_builder.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_builder_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_field_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/name_resolver.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/names.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/options.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/primitive_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/primitive_field_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/service.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/shared_code_generator.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/string_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/string_field_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_enum.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_enum_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_extension.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_file.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/objectivec/objectivec_map_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_message.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_message_field.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_nsobject_methods.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_oneof.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.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/plugin.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/helpers.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/scc.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/subprocess.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.h +) + +# //src/google/protobuf:well_known_type_protos +set(wkt_protos_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/any.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/api.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/duration.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/empty.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/field_mask.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/source_context.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/struct.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/timestamp.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/type.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/wrappers.proto +) + +# //src/google/protobuf:descriptor_proto +set(descriptor_proto_proto_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.proto +) + +# //src/google/protobuf:descriptor_proto +set(descriptor_proto_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.proto.pb.cc +) + +# //src/google/protobuf:descriptor_proto +set(descriptor_proto_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.proto.pb.h +) + +# //src/google/protobuf:descriptor_proto +set(descriptor_proto_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_proto-descriptor-set.proto.bin +) + +# //src/google/protobuf/compiler:plugin_proto +set(plugin_proto_proto_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.proto +) + +# //src/google/protobuf/compiler:plugin_proto +set(plugin_proto_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.proto.pb.cc +) + +# //src/google/protobuf/compiler:plugin_proto +set(plugin_proto_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.proto.pb.h +) + +# //src/google/protobuf/compiler:plugin_proto +set(plugin_proto_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin_proto-descriptor-set.proto.bin +) + +# //pkg:lite_test_util +set(lite_test_util_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_test_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_test_util.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.cc +) + +# //pkg:lite_test_util +set(lite_test_util_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_test_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_test_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test_util_impl.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/proto3_lite_unittest.inc + ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.h +) + +# //pkg:test_util +set(test_util_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_tester.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util.cc +) + +# //pkg:test_util +set(test_util_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test.inc + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test_util.inc + ${protobuf_SOURCE_DIR}/src/google/protobuf/message_unittest.inc + ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_tester.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util.inc + ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_unittest.inc +) + +# //src/google/protobuf:full_test_srcs +set(protobuf_test_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenastring_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/arenaz_sampler_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_database_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/drop_unknown_fields_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/dynamic_message_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_reflection_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_lite_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/inlined_string_field_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/message_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/no_field_presence_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/preserve_unknown_enum_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/proto3_arena_lite_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/proto3_arena_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/proto3_lite_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_ops_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field_reflection_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/text_format_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unknown_field_set_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/well_known_types_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_unittest.cc +) + +# //src/google/protobuf:test_protos +set(protobuf_test_protos_proto_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_proto2_unittest.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_unittest.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_arena.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_custom_options.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_drop_unknown_fields.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_embed_optimize_for.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_empty.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_enormous_descriptor.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_custom_option.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_enum.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite_imports_nonlite.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset_wire_format.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_field_presence.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_generic_services.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_optimize_for.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum2.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena_lite.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_lite.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_optional.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_well_known_types.proto +) + +# //src/google/protobuf:test_protos +set(protobuf_test_protos_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_proto2_unittest.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_unittest.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_arena.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_custom_options.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_drop_unknown_fields.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_embed_optimize_for.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_empty.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_enormous_descriptor.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_custom_option.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_enum.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite_imports_nonlite.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset_wire_format.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_field_presence.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_generic_services.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_optimize_for.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum2.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena_lite.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_lite.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_optional.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_well_known_types.proto.pb.cc +) + +# //src/google/protobuf:test_protos +set(protobuf_test_protos_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_proto2_unittest.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_unittest.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_arena.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_custom_options.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_drop_unknown_fields.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_embed_optimize_for.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_empty.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_enormous_descriptor.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_custom_option.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_enum.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite_imports_nonlite.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset_wire_format.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_field_presence.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_generic_services.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_optimize_for.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum2.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena_lite.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_lite.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_optional.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_well_known_types.proto.pb.h +) + +# //src/google/protobuf:test_protos +set(protobuf_test_protos_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/test_protos-descriptor-set.proto.bin +) + +# //src/google/protobuf:lite_test_srcs +set(protobuf_lite_test_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_arena_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_unittest.cc +) + +# //src/google/protobuf:lite_test_protos +set(protobuf_lite_test_protos_proto_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_unittest.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_lite.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public_lite.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite.proto +) + +# //src/google/protobuf:lite_test_protos +set(protobuf_lite_test_protos_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_unittest.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_lite.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public_lite.proto.pb.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite.proto.pb.cc +) + +# //src/google/protobuf:lite_test_protos +set(protobuf_lite_test_protos_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_unittest.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_lite.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public_lite.proto.pb.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite.proto.pb.h +) + +# //src/google/protobuf:lite_test_protos +set(protobuf_lite_test_protos_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_test_protos-descriptor-set.proto.bin +) + +# //src/google/protobuf/compiler:test_srcs +set(compiler_test_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message_size_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/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/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/plugin_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc +) + +# //pkg:compiler_annotation_test_util +set(annotation_test_util_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.cc +) + +# //pkg:compiler_annotation_test_util +set(annotation_test_util_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.h +) + +# //pkg:compiler_mock_code_generator +set(mock_code_generator_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/mock_code_generator.cc +) + +# //pkg:compiler_mock_code_generator +set(mock_code_generator_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/mock_code_generator.h +) + +# //src/google/protobuf/compiler:test_proto_srcs +set(compiler_test_protos_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_bad_identifiers.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_large_enum_value.proto +) + +# //src/google/protobuf/compiler:test_plugin_srcs +set(test_plugin_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/test_plugin.cc +) + +# //src/google/protobuf/io:test_srcs +set(io_test_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/printer_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/tokenizer_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_unittest.cc +) + +# //pkg:testinglib +set(testing_srcs + ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/googletest.cc +) + +# //pkg:testinglib +set(testing_hdrs + ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.h + ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/googletest.h +) + +# //src/google/protobuf/util:test_srcs +set(util_test_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/delimited_message_util_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_comparator_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_mask_util_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/default_value_objectwriter_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_objectwriter_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_stream_parser_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectsource_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectwriter_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/type_info_test_helper.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_util_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/time_util_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver_util_test.cc +) + +# //src/google/protobuf/util:test_proto_srcs +set(util_test_protos_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/anys.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/books.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/default_value.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/default_value_test.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/field_mask.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/maps.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/oneofs.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/proto3.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/struct.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/timestamp_duration.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/wrappers.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format_proto3.proto + ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer_unittest.proto +) + +# //src/google/protobuf/stubs:test_srcs +set(stubs_test_files + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/bytestream_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/int128_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/statusor_test.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringpiece_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringprintf_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/structurally_valid_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/strutil_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/template_util_unittest.cc + ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/time_test.cc +) diff --git a/src/google/protobuf/compiler/cpp/string_field.cc b/src/google/protobuf/compiler/cpp/string_field.cc index 71b9b54120..3c90dc001d 100644 --- a/src/google/protobuf/compiler/cpp/string_field.cc +++ b/src/google/protobuf/compiler/cpp/string_field.cc @@ -297,9 +297,7 @@ void StringFieldGenerator::GenerateInlineAccessorDefinitions( if (descriptor_->default_value_string().empty()) { format( "#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING\n" - " if ($field$.IsDefault()) {\n" - " $field$.Set(\"\", GetArenaForAllocation());\n" - " }\n" + " $field$.Set(\"\", GetArenaForAllocation());\n" "#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING\n"); } format(" return p;\n"); @@ -539,13 +537,9 @@ void StringFieldGenerator::GenerateConstexprAggregateInitializer( format("/*decltype($field$)*/{nullptr, false}"); return; } - if (descriptor_->default_value_string().empty()) { - format( - "/*decltype($field$)*/{&::_pbi::fixed_address_empty_string, " - "::_pbi::ConstantInitialized{}}"); - } else { - format("/*decltype($field$)*/{nullptr, ::_pbi::ConstantInitialized{}}"); - } + format( + "/*decltype($field$)*/{&::_pbi::fixed_address_empty_string, " + "::_pbi::ConstantInitialized{}}"); } void StringFieldGenerator::GenerateAggregateInitializer( diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 1c4b0f6c00..a9a485f046 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -1140,9 +1140,7 @@ inline std::string* Version::release_suffix() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.suffix_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.suffix_.IsDefault()) { - _impl_.suffix_.Set("", GetArenaForAllocation()); - } + _impl_.suffix_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -1287,9 +1285,7 @@ inline std::string* CodeGeneratorRequest::release_parameter() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.parameter_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.parameter_.IsDefault()) { - _impl_.parameter_.Set("", GetArenaForAllocation()); - } + _impl_.parameter_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -1486,9 +1482,7 @@ inline std::string* CodeGeneratorResponse_File::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); - } + _impl_.name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -1554,9 +1548,7 @@ inline std::string* CodeGeneratorResponse_File::release_insertion_point() { _impl_._has_bits_[0] &= ~0x00000002u; auto* p = _impl_.insertion_point_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.insertion_point_.IsDefault()) { - _impl_.insertion_point_.Set("", GetArenaForAllocation()); - } + _impl_.insertion_point_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -1622,9 +1614,7 @@ inline std::string* CodeGeneratorResponse_File::release_content() { _impl_._has_bits_[0] &= ~0x00000004u; auto* p = _impl_.content_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.content_.IsDefault()) { - _impl_.content_.Set("", GetArenaForAllocation()); - } + _impl_.content_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -1781,9 +1771,7 @@ inline std::string* CodeGeneratorResponse::release_error() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.error_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.error_.IsDefault()) { - _impl_.error_.Set("", GetArenaForAllocation()); - } + _impl_.error_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 78df1d5124..b8710b274c 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -8626,9 +8626,7 @@ inline std::string* FileDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); - } + _impl_.name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -8694,9 +8692,7 @@ inline std::string* FileDescriptorProto::release_package() { _impl_._has_bits_[0] &= ~0x00000002u; auto* p = _impl_.package_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.package_.IsDefault()) { - _impl_.package_.Set("", GetArenaForAllocation()); - } + _impl_.package_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -9271,9 +9267,7 @@ inline std::string* FileDescriptorProto::release_syntax() { _impl_._has_bits_[0] &= ~0x00000004u; auto* p = _impl_.syntax_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.syntax_.IsDefault()) { - _impl_.syntax_.Set("", GetArenaForAllocation()); - } + _impl_.syntax_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -9553,9 +9547,7 @@ inline std::string* DescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); - } + _impl_.name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -10114,9 +10106,7 @@ inline std::string* FieldDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); - } + _impl_.name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -10268,9 +10258,7 @@ inline std::string* FieldDescriptorProto::release_type_name() { _impl_._has_bits_[0] &= ~0x00000004u; auto* p = _impl_.type_name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.type_name_.IsDefault()) { - _impl_.type_name_.Set("", GetArenaForAllocation()); - } + _impl_.type_name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -10336,9 +10324,7 @@ inline std::string* FieldDescriptorProto::release_extendee() { _impl_._has_bits_[0] &= ~0x00000002u; auto* p = _impl_.extendee_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.extendee_.IsDefault()) { - _impl_.extendee_.Set("", GetArenaForAllocation()); - } + _impl_.extendee_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -10404,9 +10390,7 @@ inline std::string* FieldDescriptorProto::release_default_value() { _impl_._has_bits_[0] &= ~0x00000008u; auto* p = _impl_.default_value_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.default_value_.IsDefault()) { - _impl_.default_value_.Set("", GetArenaForAllocation()); - } + _impl_.default_value_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -10500,9 +10484,7 @@ inline std::string* FieldDescriptorProto::release_json_name() { _impl_._has_bits_[0] &= ~0x00000010u; auto* p = _impl_.json_name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.json_name_.IsDefault()) { - _impl_.json_name_.Set("", GetArenaForAllocation()); - } + _impl_.json_name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -10690,9 +10672,7 @@ inline std::string* OneofDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); - } + _impl_.name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -10912,9 +10892,7 @@ inline std::string* EnumDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); - } + _impl_.name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -11229,9 +11207,7 @@ inline std::string* EnumValueDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); - } + _impl_.name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -11419,9 +11395,7 @@ inline std::string* ServiceDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); - } + _impl_.name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -11621,9 +11595,7 @@ inline std::string* MethodDescriptorProto::release_name() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_.IsDefault()) { - _impl_.name_.Set("", GetArenaForAllocation()); - } + _impl_.name_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -11689,9 +11661,7 @@ inline std::string* MethodDescriptorProto::release_input_type() { _impl_._has_bits_[0] &= ~0x00000002u; auto* p = _impl_.input_type_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.input_type_.IsDefault()) { - _impl_.input_type_.Set("", GetArenaForAllocation()); - } + _impl_.input_type_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -11757,9 +11727,7 @@ inline std::string* MethodDescriptorProto::release_output_type() { _impl_._has_bits_[0] &= ~0x00000004u; auto* p = _impl_.output_type_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.output_type_.IsDefault()) { - _impl_.output_type_.Set("", GetArenaForAllocation()); - } + _impl_.output_type_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -11975,9 +11943,7 @@ inline std::string* FileOptions::release_java_package() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.java_package_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.java_package_.IsDefault()) { - _impl_.java_package_.Set("", GetArenaForAllocation()); - } + _impl_.java_package_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -12043,9 +12009,7 @@ inline std::string* FileOptions::release_java_outer_classname() { _impl_._has_bits_[0] &= ~0x00000002u; auto* p = _impl_.java_outer_classname_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.java_outer_classname_.IsDefault()) { - _impl_.java_outer_classname_.Set("", GetArenaForAllocation()); - } + _impl_.java_outer_classname_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -12224,9 +12188,7 @@ inline std::string* FileOptions::release_go_package() { _impl_._has_bits_[0] &= ~0x00000004u; auto* p = _impl_.go_package_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.go_package_.IsDefault()) { - _impl_.go_package_.Set("", GetArenaForAllocation()); - } + _impl_.go_package_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -12460,9 +12422,7 @@ inline std::string* FileOptions::release_objc_class_prefix() { _impl_._has_bits_[0] &= ~0x00000008u; auto* p = _impl_.objc_class_prefix_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.objc_class_prefix_.IsDefault()) { - _impl_.objc_class_prefix_.Set("", GetArenaForAllocation()); - } + _impl_.objc_class_prefix_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -12528,9 +12488,7 @@ inline std::string* FileOptions::release_csharp_namespace() { _impl_._has_bits_[0] &= ~0x00000010u; auto* p = _impl_.csharp_namespace_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.csharp_namespace_.IsDefault()) { - _impl_.csharp_namespace_.Set("", GetArenaForAllocation()); - } + _impl_.csharp_namespace_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -12596,9 +12554,7 @@ inline std::string* FileOptions::release_swift_prefix() { _impl_._has_bits_[0] &= ~0x00000020u; auto* p = _impl_.swift_prefix_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.swift_prefix_.IsDefault()) { - _impl_.swift_prefix_.Set("", GetArenaForAllocation()); - } + _impl_.swift_prefix_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -12664,9 +12620,7 @@ inline std::string* FileOptions::release_php_class_prefix() { _impl_._has_bits_[0] &= ~0x00000040u; auto* p = _impl_.php_class_prefix_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.php_class_prefix_.IsDefault()) { - _impl_.php_class_prefix_.Set("", GetArenaForAllocation()); - } + _impl_.php_class_prefix_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -12732,9 +12686,7 @@ inline std::string* FileOptions::release_php_namespace() { _impl_._has_bits_[0] &= ~0x00000080u; auto* p = _impl_.php_namespace_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.php_namespace_.IsDefault()) { - _impl_.php_namespace_.Set("", GetArenaForAllocation()); - } + _impl_.php_namespace_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -12800,9 +12752,7 @@ inline std::string* FileOptions::release_php_metadata_namespace() { _impl_._has_bits_[0] &= ~0x00000100u; auto* p = _impl_.php_metadata_namespace_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.php_metadata_namespace_.IsDefault()) { - _impl_.php_metadata_namespace_.Set("", GetArenaForAllocation()); - } + _impl_.php_metadata_namespace_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -12868,9 +12818,7 @@ inline std::string* FileOptions::release_ruby_package() { _impl_._has_bits_[0] &= ~0x00000200u; auto* p = _impl_.ruby_package_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.ruby_package_.IsDefault()) { - _impl_.ruby_package_.Set("", GetArenaForAllocation()); - } + _impl_.ruby_package_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -13767,9 +13715,7 @@ inline std::string* UninterpretedOption_NamePart::release_name_part() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.name_part_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.name_part_.IsDefault()) { - _impl_.name_part_.Set("", GetArenaForAllocation()); - } + _impl_.name_part_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -13907,9 +13853,7 @@ inline std::string* UninterpretedOption::release_identifier_value() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.identifier_value_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.identifier_value_.IsDefault()) { - _impl_.identifier_value_.Set("", GetArenaForAllocation()); - } + _impl_.identifier_value_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -14059,9 +14003,7 @@ inline std::string* UninterpretedOption::release_string_value() { _impl_._has_bits_[0] &= ~0x00000002u; auto* p = _impl_.string_value_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.string_value_.IsDefault()) { - _impl_.string_value_.Set("", GetArenaForAllocation()); - } + _impl_.string_value_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -14127,9 +14069,7 @@ inline std::string* UninterpretedOption::release_aggregate_value() { _impl_._has_bits_[0] &= ~0x00000004u; auto* p = _impl_.aggregate_value_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.aggregate_value_.IsDefault()) { - _impl_.aggregate_value_.Set("", GetArenaForAllocation()); - } + _impl_.aggregate_value_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -14293,9 +14233,7 @@ inline std::string* SourceCodeInfo_Location::release_leading_comments() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.leading_comments_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.leading_comments_.IsDefault()) { - _impl_.leading_comments_.Set("", GetArenaForAllocation()); - } + _impl_.leading_comments_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -14361,9 +14299,7 @@ inline std::string* SourceCodeInfo_Location::release_trailing_comments() { _impl_._has_bits_[0] &= ~0x00000002u; auto* p = _impl_.trailing_comments_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.trailing_comments_.IsDefault()) { - _impl_.trailing_comments_.Set("", GetArenaForAllocation()); - } + _impl_.trailing_comments_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } @@ -14599,9 +14535,7 @@ inline std::string* GeneratedCodeInfo_Annotation::release_source_file() { _impl_._has_bits_[0] &= ~0x00000001u; auto* p = _impl_.source_file_.Release(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.source_file_.IsDefault()) { - _impl_.source_file_.Set("", GetArenaForAllocation()); - } + _impl_.source_file_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING return p; } diff --git a/src/google/protobuf/io/tokenizer.h b/src/google/protobuf/io/tokenizer.h index ca2747b4ba..bb95c0f08e 100644 --- a/src/google/protobuf/io/tokenizer.h +++ b/src/google/protobuf/io/tokenizer.h @@ -148,11 +148,11 @@ class PROTOBUF_EXPORT Tokenizer { // Get the current token. This is updated when Next() is called. Before // the first call to Next(), current() has type TYPE_START and no contents. - const Token& current(); + const Token& current() const; // Return the previous token -- i.e. what current() returned before the // previous call to Next(). - const Token& previous(); + const Token& previous() const; // Advance to the next token. Returns false if the end of the input is // reached. @@ -422,9 +422,9 @@ class PROTOBUF_EXPORT Tokenizer { }; // inline methods ==================================================== -inline const Tokenizer::Token& Tokenizer::current() { return current_; } +inline const Tokenizer::Token& Tokenizer::current() const { return current_; } -inline const Tokenizer::Token& Tokenizer::previous() { return previous_; } +inline const Tokenizer::Token& Tokenizer::previous() const { return previous_; } inline void Tokenizer::ParseString(const std::string& text, std::string* output) { diff --git a/src/google/protobuf/util/time_util_test.cc b/src/google/protobuf/util/time_util_test.cc index a741218c90..d17e096089 100644 --- a/src/google/protobuf/util/time_util_test.cc +++ b/src/google/protobuf/util/time_util_test.cc @@ -415,6 +415,7 @@ TEST(TimeUtilTest, IsTimestampValid) { } #ifdef PROTOBUF_HAS_DEATH_TEST // death tests do not work on Windows yet. +#ifndef NDEBUG TEST(TimeUtilTest, DurationBounds) { Duration overflow; @@ -426,38 +427,38 @@ TEST(TimeUtilTest, DurationBounds) { Duration underflow_nanos; underflow_nanos.set_nanos(TimeUtil::kDurationMinNanoseconds - 1); - EXPECT_DEBUG_DEATH({ TimeUtil::SecondsToDuration(overflow.seconds()); }, + EXPECT_DEATH({ TimeUtil::SecondsToDuration(overflow.seconds()); }, "Duration seconds"); - EXPECT_DEBUG_DEATH({ TimeUtil::SecondsToDuration(underflow.seconds()); }, + EXPECT_DEATH({ TimeUtil::SecondsToDuration(underflow.seconds()); }, "Duration seconds"); - EXPECT_DEBUG_DEATH( + EXPECT_DEATH( { TimeUtil::MinutesToDuration(overflow.seconds() / 60 + 1); }, "Duration minutes"); - EXPECT_DEBUG_DEATH( + EXPECT_DEATH( { TimeUtil::MinutesToDuration(underflow.seconds() / 60 - 1); }, "Duration minutes"); - EXPECT_DEBUG_DEATH( + EXPECT_DEATH( { TimeUtil::HoursToDuration(overflow.seconds() / 60 + 1); }, "Duration hours"); - EXPECT_DEBUG_DEATH( + EXPECT_DEATH( { TimeUtil::HoursToDuration(underflow.seconds() / 60 - 1); }, "Duration hours"); - EXPECT_DEBUG_DEATH({ TimeUtil::DurationToNanoseconds(overflow); }, + EXPECT_DEATH({ TimeUtil::DurationToNanoseconds(overflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::DurationToNanoseconds(underflow); }, + EXPECT_DEATH({ TimeUtil::DurationToNanoseconds(underflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::DurationToNanoseconds(overflow_nanos); }, + EXPECT_DEATH({ TimeUtil::DurationToNanoseconds(overflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::DurationToNanoseconds(underflow_nanos); }, + EXPECT_DEATH({ TimeUtil::DurationToNanoseconds(underflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::DurationToSeconds(overflow); }, + EXPECT_DEATH({ TimeUtil::DurationToSeconds(overflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::DurationToSeconds(underflow); }, + EXPECT_DEATH({ TimeUtil::DurationToSeconds(underflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::DurationToSeconds(overflow_nanos); }, + EXPECT_DEATH({ TimeUtil::DurationToSeconds(overflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::DurationToSeconds(underflow_nanos); }, + EXPECT_DEATH({ TimeUtil::DurationToSeconds(underflow_nanos); }, "outside of the valid range"); } @@ -471,43 +472,43 @@ TEST(TimeUtilTest, TimestampBounds) { Timestamp underflow_nanos; underflow_nanos.set_nanos(TimeUtil::kDurationMinNanoseconds - 1); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToNanoseconds(overflow); }, + EXPECT_DEATH({ TimeUtil::TimestampToNanoseconds(overflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToNanoseconds(underflow); }, + EXPECT_DEATH({ TimeUtil::TimestampToNanoseconds(underflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToNanoseconds(overflow_nanos); }, + EXPECT_DEATH({ TimeUtil::TimestampToNanoseconds(overflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToNanoseconds(underflow_nanos); }, + EXPECT_DEATH({ TimeUtil::TimestampToNanoseconds(underflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToMicroseconds(overflow); }, + EXPECT_DEATH({ TimeUtil::TimestampToMicroseconds(overflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToMicroseconds(underflow); }, + EXPECT_DEATH({ TimeUtil::TimestampToMicroseconds(underflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToMicroseconds(overflow_nanos); }, + EXPECT_DEATH({ TimeUtil::TimestampToMicroseconds(overflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToMicroseconds(underflow_nanos); }, + EXPECT_DEATH({ TimeUtil::TimestampToMicroseconds(underflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToMilliseconds(overflow); }, + EXPECT_DEATH({ TimeUtil::TimestampToMilliseconds(overflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToMilliseconds(underflow); }, + EXPECT_DEATH({ TimeUtil::TimestampToMilliseconds(underflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToMilliseconds(overflow_nanos); }, + EXPECT_DEATH({ TimeUtil::TimestampToMilliseconds(overflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToMilliseconds(underflow_nanos); }, + EXPECT_DEATH({ TimeUtil::TimestampToMilliseconds(underflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToSeconds(overflow); }, + EXPECT_DEATH({ TimeUtil::TimestampToSeconds(overflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToSeconds(underflow); }, + EXPECT_DEATH({ TimeUtil::TimestampToSeconds(underflow); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToSeconds(overflow_nanos); }, + EXPECT_DEATH({ TimeUtil::TimestampToSeconds(overflow_nanos); }, "outside of the valid range"); - EXPECT_DEBUG_DEATH({ TimeUtil::TimestampToSeconds(underflow_nanos); }, + EXPECT_DEATH({ TimeUtil::TimestampToSeconds(underflow_nanos); }, "outside of the valid range"); } - +#endif // !NDEBUG #endif // PROTOBUF_HAS_DEATH_TEST } // namespace