From ff7bdad231d037802fd457ee4fd65e0291d366d7 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Sun, 23 Aug 2015 10:45:14 -0700 Subject: [PATCH] Fix bugs on windows --- BUILD | 12 +- Makefile.am | 59 +++-- cmake/libprotobuf-lite.cmake | 1 + cmake/libprotobuf.cmake | 1 - cmake/tests.cmake | 1 - src/google/protobuf/any.pb.cc | 14 +- src/google/protobuf/api.pb.cc | 178 ++++++------- src/google/protobuf/api.pb.h | 56 ++-- src/google/protobuf/arena.h | 3 + .../protobuf/compiler/cpp/cpp_unittest.cc | 4 + src/google/protobuf/compiler/plugin.pb.cc | 8 +- src/google/protobuf/descriptor.pb.cc | 24 +- src/google/protobuf/field_mask.pb.cc | 18 +- .../protobuf/generated_message_reflection.h | 4 +- src/google/protobuf/map.h | 25 +- src/google/protobuf/map_entry_lite.h | 4 +- src/google/protobuf/map_field.cc | 14 +- src/google/protobuf/map_field_inl.h | 4 +- src/google/protobuf/source_context.pb.cc | 14 +- src/google/protobuf/struct.pb.cc | 67 +++-- src/google/protobuf/struct.pb.h | 30 ++- src/google/protobuf/stubs/hash.h | 20 +- src/google/protobuf/stubs/int128.h | 10 +- src/google/protobuf/stubs/mathutil.h | 16 +- src/google/protobuf/stubs/status.cc | 1 - src/google/protobuf/type.pb.cc | 248 +++++++++--------- src/google/protobuf/type.pb.h | 88 +++---- src/google/protobuf/util/internal/datapiece.h | 14 +- .../internal/default_value_objectwriter.h | 2 +- .../util/internal/json_objectwriter.cc | 9 +- src/google/protobuf/util/internal/type_info.h | 2 +- src/google/protobuf/util/internal/utility.cc | 2 +- src/google/protobuf/util/json_util.h | 4 +- src/google/protobuf/util/time_util.h | 31 ++- src/google/protobuf/util/type_resolver_util.h | 2 +- src/google/protobuf/wrappers.pb.cc | 14 +- src/google/protobuf/wrappers.pb.h | 10 +- update_file_lists.sh | 7 +- 38 files changed, 553 insertions(+), 468 deletions(-) diff --git a/BUILD b/BUILD index 5cfed337e6..571f48b89d 100644 --- a/BUILD +++ b/BUILD @@ -35,11 +35,13 @@ cc_library( "src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc", "src/google/protobuf/stubs/bytestream.cc", "src/google/protobuf/stubs/common.cc", + "src/google/protobuf/stubs/int128.cc", "src/google/protobuf/stubs/once.cc", "src/google/protobuf/stubs/status.cc", "src/google/protobuf/stubs/statusor.cc", "src/google/protobuf/stubs/stringpiece.cc", "src/google/protobuf/stubs/stringprintf.cc", + "src/google/protobuf/stubs/structurally_valid.cc", "src/google/protobuf/stubs/strutil.cc", "src/google/protobuf/stubs/time.cc", "src/google/protobuf/wire_format_lite.cc", @@ -80,13 +82,13 @@ cc_library( "src/google/protobuf/source_context.pb.cc", "src/google/protobuf/struct.pb.cc", "src/google/protobuf/stubs/mathlimits.cc", - "src/google/protobuf/stubs/structurally_valid.cc", "src/google/protobuf/stubs/substitute.cc", "src/google/protobuf/text_format.cc", "src/google/protobuf/timestamp.pb.cc", "src/google/protobuf/type.pb.cc", "src/google/protobuf/unknown_field_set.cc", "src/google/protobuf/util/field_comparator.cc", + "src/google/protobuf/util/field_mask_util.cc", "src/google/protobuf/util/internal/datapiece.cc", "src/google/protobuf/util/internal/default_value_objectwriter.cc", "src/google/protobuf/util/internal/error_listener.cc", @@ -102,6 +104,7 @@ cc_library( "src/google/protobuf/util/internal/utility.cc", "src/google/protobuf/util/json_util.cc", "src/google/protobuf/util/message_differencer.cc", + "src/google/protobuf/util/time_util.cc", "src/google/protobuf/util/type_resolver_util.cc", "src/google/protobuf/wire_format.cc", "src/google/protobuf/wrappers.pb.cc", @@ -180,6 +183,7 @@ cc_library( "src/google/protobuf/compiler/java/java_enum.cc", "src/google/protobuf/compiler/java/java_enum_field.cc", "src/google/protobuf/compiler/java/java_enum_field_lite.cc", + "src/google/protobuf/compiler/java/java_enum_lite.cc", "src/google/protobuf/compiler/java/java_extension.cc", "src/google/protobuf/compiler/java/java_field.cc", "src/google/protobuf/compiler/java/java_file.cc", @@ -258,6 +262,7 @@ LITE_TEST_PROTOS = [ "google/protobuf/unittest_import_lite.proto", "google/protobuf/unittest_import_public_lite.proto", "google/protobuf/unittest_lite.proto", + "google/protobuf/unittest_no_arena_lite.proto", ] TEST_PROTOS = [ @@ -278,6 +283,7 @@ TEST_PROTOS = [ "google/protobuf/unittest_import_public.proto", "google/protobuf/unittest_lite_imports_nonlite.proto", "google/protobuf/unittest_mset.proto", + "google/protobuf/unittest_mset_wire_format.proto", "google/protobuf/unittest_no_arena.proto", "google/protobuf/unittest_no_arena_import.proto", "google/protobuf/unittest_no_field_presence.proto", @@ -293,6 +299,7 @@ TEST_PROTOS = [ "google/protobuf/util/internal/testdata/default_value_test.proto", "google/protobuf/util/internal/testdata/field_mask.proto", "google/protobuf/util/internal/testdata/maps.proto", + "google/protobuf/util/internal/testdata/oneofs.proto", "google/protobuf/util/internal/testdata/struct.proto", "google/protobuf/util/internal/testdata/timestamp_duration.proto", "google/protobuf/util/json_format_proto3.proto", @@ -381,6 +388,7 @@ cc_test( "src/google/protobuf/repeated_field_unittest.cc", "src/google/protobuf/stubs/bytestream_unittest.cc", "src/google/protobuf/stubs/common_unittest.cc", + "src/google/protobuf/stubs/int128_unittest.cc", "src/google/protobuf/stubs/once_unittest.cc", "src/google/protobuf/stubs/status_test.cc", "src/google/protobuf/stubs/statusor_test.cc", @@ -394,6 +402,7 @@ cc_test( "src/google/protobuf/text_format_unittest.cc", "src/google/protobuf/unknown_field_set_unittest.cc", "src/google/protobuf/util/field_comparator_test.cc", + "src/google/protobuf/util/field_mask_util_test.cc", "src/google/protobuf/util/internal/default_value_objectwriter_test.cc", "src/google/protobuf/util/internal/json_objectwriter_test.cc", "src/google/protobuf/util/internal/json_stream_parser_test.cc", @@ -401,6 +410,7 @@ cc_test( "src/google/protobuf/util/internal/protostream_objectwriter_test.cc", "src/google/protobuf/util/internal/type_info_test_helper.cc", "src/google/protobuf/util/json_util_test.cc", + "src/google/protobuf/util/time_util_test.cc", "src/google/protobuf/util/type_resolver_util_test.cc", "src/google/protobuf/well_known_types_unittest.cc", "src/google/protobuf/wire_format_unittest.cc", diff --git a/Makefile.am b/Makefile.am index fad35a0960..0e137c0e64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -594,33 +594,38 @@ ruby_EXTRA_DIST= \ all_EXTRA_DIST=$(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(javanano_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST) -EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ - autogen.sh \ - generate_descriptor_proto.sh \ - README.md \ - INSTALL.txt \ - LICENSE \ - CONTRIBUTORS.txt \ - CHANGES.txt \ - update_file_lists.sh \ - cmake/CMakeLists.txt \ - cmake/libprotobuf.cmake \ - cmake/libprotobuf-lite.cmake \ - cmake/libprotoc.cmake \ - cmake/protoc.cmake \ - cmake/README.md \ - cmake/tests.cmake \ - editors/README.txt \ - editors/proto.vim \ - editors/protobuf-mode.el \ - examples/README.txt \ - examples/Makefile \ - examples/addressbook.proto \ - examples/add_person.cc \ - examples/list_people.cc \ - examples/AddPerson.java \ - examples/ListPeople.java \ - examples/add_person.py \ +EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ + autogen.sh \ + generate_descriptor_proto.sh \ + README.md \ + INSTALL.txt \ + LICENSE \ + CONTRIBUTORS.txt \ + CHANGES.txt \ + update_file_lists.sh \ + cmake/CMakeLists.txt \ + cmake/README.md \ + cmake/extract_includes.bat.in \ + cmake/install.cmake \ + cmake/libprotobuf.cmake \ + cmake/libprotobuf-lite.cmake \ + cmake/libprotoc.cmake \ + cmake/protobuf-config-version.cmake.in \ + cmake/protobuf-config.cmake.in \ + cmake/protobuf-module.cmake.in \ + cmake/protoc.cmake \ + cmake/tests.cmake \ + editors/README.txt \ + editors/proto.vim \ + editors/protobuf-mode.el \ + examples/README.txt \ + examples/Makefile \ + examples/addressbook.proto \ + examples/add_person.cc \ + examples/list_people.cc \ + examples/AddPerson.java \ + examples/ListPeople.java \ + examples/add_person.py \ examples/list_people.py # Deletes all the files generated by autogen.sh. diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake index e2cec9d114..9fafc31676 100644 --- a/cmake/libprotobuf-lite.cmake +++ b/cmake/libprotobuf-lite.cmake @@ -18,6 +18,7 @@ set(libprotobuf_lite_files ${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 diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index f25e8c08a9..64a9cae01a 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -25,7 +25,6 @@ set(libprotobuf_files ${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/mathlimits.cc - ${protobuf_source_dir}/src/google/protobuf/stubs/structurally_valid.cc ${protobuf_source_dir}/src/google/protobuf/stubs/substitute.cc ${protobuf_source_dir}/src/google/protobuf/text_format.cc ${protobuf_source_dir}/src/google/protobuf/timestamp.pb.cc diff --git a/cmake/tests.cmake b/cmake/tests.cmake index ef4dfe0221..65feca21cb 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -36,7 +36,6 @@ set(tests_protos google/protobuf/unittest_drop_unknown_fields.proto google/protobuf/unittest_embed_optimize_for.proto google/protobuf/unittest_empty.proto - google/protobuf/unittest_enormous_descriptor.proto google/protobuf/unittest_import.proto google/protobuf/unittest_import_public.proto google/protobuf/unittest_lite_imports_nonlite.proto diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index c2e5813149..cbb5d23357 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -208,10 +208,10 @@ bool Any::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_type_url())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->type_url().data(), this->type_url().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Any.type_url"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Any.type_url")); } else { goto handle_unusual; } @@ -258,9 +258,9 @@ void Any::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.Any) // optional string type_url = 1; if (this->type_url().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->type_url().data(), this->type_url().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Any.type_url"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->type_url(), output); @@ -280,9 +280,9 @@ void Any::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Any) // optional string type_url = 1; if (this->type_url().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->type_url().data(), this->type_url().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Any.type_url"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index 671eaca7fa..0a2c4ec0ba 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -289,10 +289,10 @@ bool Api::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Api.name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Api.name")); } else { goto handle_unusual; } @@ -339,10 +339,10 @@ bool Api::MergePartialFromCodedStream( parse_version: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_version())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->version().data(), this->version().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Api.version"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Api.version")); } else { goto handle_unusual; } @@ -422,9 +422,9 @@ void Api::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.Api) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Api.name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->name(), output); @@ -444,9 +444,9 @@ void Api::SerializeWithCachedSizes( // optional string version = 4; if (this->version().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->version().data(), this->version().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Api.version"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 4, this->version(), output); @@ -478,9 +478,9 @@ void Api::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Api) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Api.name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -503,9 +503,9 @@ void Api::SerializeWithCachedSizes( // optional string version = 4; if (this->version().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->version().data(), this->version().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Api.version"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -723,28 +723,28 @@ int Api::methods_size() const { void Api::clear_methods() { methods_.Clear(); } - const ::google::protobuf::Method& Api::methods(int index) const { +const ::google::protobuf::Method& Api::methods(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Api.methods) return methods_.Get(index); } - ::google::protobuf::Method* Api::mutable_methods(int index) { +::google::protobuf::Method* Api::mutable_methods(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.methods) return methods_.Mutable(index); } - ::google::protobuf::Method* Api::add_methods() { +::google::protobuf::Method* Api::add_methods() { // @@protoc_insertion_point(field_add:google.protobuf.Api.methods) return methods_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >& -Api::methods() const { - // @@protoc_insertion_point(field_list:google.protobuf.Api.methods) - return methods_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >* Api::mutable_methods() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.methods) return &methods_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >& +Api::methods() const { + // @@protoc_insertion_point(field_list:google.protobuf.Api.methods) + return methods_; +} // repeated .google.protobuf.Option options = 3; int Api::options_size() const { @@ -753,28 +753,28 @@ int Api::options_size() const { void Api::clear_options() { options_.Clear(); } - const ::google::protobuf::Option& Api::options(int index) const { +const ::google::protobuf::Option& Api::options(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Api.options) return options_.Get(index); } - ::google::protobuf::Option* Api::mutable_options(int index) { +::google::protobuf::Option* Api::mutable_options(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.options) return options_.Mutable(index); } - ::google::protobuf::Option* Api::add_options() { +::google::protobuf::Option* Api::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Api.options) return options_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Api::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Api.options) - return options_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Api::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.options) return &options_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Api::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Api.options) + return options_; +} // optional string version = 4; void Api::clear_version() { @@ -827,11 +827,11 @@ void Api::clear_source_context() { if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_; source_context_ = NULL; } - const ::google::protobuf::SourceContext& Api::source_context() const { +const ::google::protobuf::SourceContext& Api::source_context() const { // @@protoc_insertion_point(field_get:google.protobuf.Api.source_context) return source_context_ != NULL ? *source_context_ : *default_instance_->source_context_; } - ::google::protobuf::SourceContext* Api::mutable_source_context() { +::google::protobuf::SourceContext* Api::mutable_source_context() { if (source_context_ == NULL) { source_context_ = new ::google::protobuf::SourceContext; @@ -839,13 +839,13 @@ void Api::clear_source_context() { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.source_context) return source_context_; } - ::google::protobuf::SourceContext* Api::release_source_context() { +::google::protobuf::SourceContext* Api::release_source_context() { ::google::protobuf::SourceContext* temp = source_context_; source_context_ = NULL; return temp; } - void Api::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { +void Api::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { delete source_context_; source_context_ = source_context; if (source_context) { @@ -863,28 +863,28 @@ int Api::mixins_size() const { void Api::clear_mixins() { mixins_.Clear(); } - const ::google::protobuf::Mixin& Api::mixins(int index) const { +const ::google::protobuf::Mixin& Api::mixins(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Api.mixins) return mixins_.Get(index); } - ::google::protobuf::Mixin* Api::mutable_mixins(int index) { +::google::protobuf::Mixin* Api::mutable_mixins(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Api.mixins) return mixins_.Mutable(index); } - ::google::protobuf::Mixin* Api::add_mixins() { +::google::protobuf::Mixin* Api::add_mixins() { // @@protoc_insertion_point(field_add:google.protobuf.Api.mixins) return mixins_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >& -Api::mixins() const { - // @@protoc_insertion_point(field_list:google.protobuf.Api.mixins) - return mixins_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >* Api::mutable_mixins() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.mixins) return &mixins_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >& +Api::mixins() const { + // @@protoc_insertion_point(field_list:google.protobuf.Api.mixins) + return mixins_; +} // optional .google.protobuf.Syntax syntax = 7; void Api::clear_syntax() { @@ -1017,10 +1017,10 @@ bool Method::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Method.name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Method.name")); } else { goto handle_unusual; } @@ -1034,10 +1034,10 @@ bool Method::MergePartialFromCodedStream( parse_request_type_url: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_request_type_url())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->request_type_url().data(), this->request_type_url().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Method.request_type_url"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Method.request_type_url")); } else { goto handle_unusual; } @@ -1066,10 +1066,10 @@ bool Method::MergePartialFromCodedStream( parse_response_type_url: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_response_type_url())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->response_type_url().data(), this->response_type_url().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Method.response_type_url"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Method.response_type_url")); } else { goto handle_unusual; } @@ -1151,9 +1151,9 @@ void Method::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.Method) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->name(), output); @@ -1161,9 +1161,9 @@ void Method::SerializeWithCachedSizes( // optional string request_type_url = 2; if (this->request_type_url().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->request_type_url().data(), this->request_type_url().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.request_type_url"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 2, this->request_type_url(), output); @@ -1176,9 +1176,9 @@ void Method::SerializeWithCachedSizes( // optional string response_type_url = 4; if (this->response_type_url().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->response_type_url().data(), this->response_type_url().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.response_type_url"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 4, this->response_type_url(), output); @@ -1209,9 +1209,9 @@ void Method::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Method) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -1220,9 +1220,9 @@ void Method::SerializeWithCachedSizes( // optional string request_type_url = 2; if (this->request_type_url().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->request_type_url().data(), this->request_type_url().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.request_type_url"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -1236,9 +1236,9 @@ void Method::SerializeWithCachedSizes( // optional string response_type_url = 4; if (this->response_type_url().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->response_type_url().data(), this->response_type_url().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Method.response_type_url"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -1567,28 +1567,28 @@ int Method::options_size() const { void Method::clear_options() { options_.Clear(); } - const ::google::protobuf::Option& Method::options(int index) const { +const ::google::protobuf::Option& Method::options(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Method.options) return options_.Get(index); } - ::google::protobuf::Option* Method::mutable_options(int index) { +::google::protobuf::Option* Method::mutable_options(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Method.options) return options_.Mutable(index); } - ::google::protobuf::Option* Method::add_options() { +::google::protobuf::Option* Method::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Method.options) return options_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Method::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Method.options) - return options_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Method::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Method.options) return &options_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Method::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Method.options) + return options_; +} // optional .google.protobuf.Syntax syntax = 7; void Method::clear_syntax() { @@ -1696,10 +1696,10 @@ bool Mixin::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Mixin.name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Mixin.name")); } else { goto handle_unusual; } @@ -1713,10 +1713,10 @@ bool Mixin::MergePartialFromCodedStream( parse_root: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_root())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->root().data(), this->root().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Mixin.root"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Mixin.root")); } else { goto handle_unusual; } @@ -1750,9 +1750,9 @@ void Mixin::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.Mixin) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Mixin.name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->name(), output); @@ -1760,9 +1760,9 @@ void Mixin::SerializeWithCachedSizes( // optional string root = 2; if (this->root().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->root().data(), this->root().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Mixin.root"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 2, this->root(), output); @@ -1776,9 +1776,9 @@ void Mixin::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Mixin) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Mixin.name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -1787,9 +1787,9 @@ void Mixin::SerializeWithCachedSizes( // optional string root = 2; if (this->root().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->root().data(), this->root().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Mixin.root"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 414734a91f..3c5a6f3125 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -119,10 +119,10 @@ class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message { const ::google::protobuf::Method& methods(int index) const; ::google::protobuf::Method* mutable_methods(int index); ::google::protobuf::Method* add_methods(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >& - methods() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >* mutable_methods(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >& + methods() const; // repeated .google.protobuf.Option options = 3; int options_size() const; @@ -131,10 +131,10 @@ class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message { const ::google::protobuf::Option& options(int index) const; ::google::protobuf::Option* mutable_options(int index); ::google::protobuf::Option* add_options(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& - options() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* mutable_options(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& + options() const; // optional string version = 4; void clear_version(); @@ -163,10 +163,10 @@ class LIBPROTOBUF_EXPORT Api : public ::google::protobuf::Message { const ::google::protobuf::Mixin& mixins(int index) const; ::google::protobuf::Mixin* mutable_mixins(int index); ::google::protobuf::Mixin* add_mixins(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >& - mixins() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >* mutable_mixins(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >& + mixins() const; // optional .google.protobuf.Syntax syntax = 7; void clear_syntax(); @@ -304,10 +304,10 @@ class LIBPROTOBUF_EXPORT Method : public ::google::protobuf::Message { const ::google::protobuf::Option& options(int index) const; ::google::protobuf::Option* mutable_options(int index); ::google::protobuf::Option* add_options(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& - options() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* mutable_options(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& + options() const; // optional .google.protobuf.Syntax syntax = 7; void clear_syntax(); @@ -500,16 +500,16 @@ inline ::google::protobuf::Method* Api::add_methods() { // @@protoc_insertion_point(field_add:google.protobuf.Api.methods) return methods_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >& -Api::methods() const { - // @@protoc_insertion_point(field_list:google.protobuf.Api.methods) - return methods_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >* Api::mutable_methods() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.methods) return &methods_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Method >& +Api::methods() const { + // @@protoc_insertion_point(field_list:google.protobuf.Api.methods) + return methods_; +} // repeated .google.protobuf.Option options = 3; inline int Api::options_size() const { @@ -530,16 +530,16 @@ inline ::google::protobuf::Option* Api::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Api.options) return options_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Api::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Api.options) - return options_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Api::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.options) return &options_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Api::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Api.options) + return options_; +} // optional string version = 4; inline void Api::clear_version() { @@ -640,16 +640,16 @@ inline ::google::protobuf::Mixin* Api::add_mixins() { // @@protoc_insertion_point(field_add:google.protobuf.Api.mixins) return mixins_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >& -Api::mixins() const { - // @@protoc_insertion_point(field_list:google.protobuf.Api.mixins) - return mixins_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >* Api::mutable_mixins() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.mixins) return &mixins_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Mixin >& +Api::mixins() const { + // @@protoc_insertion_point(field_list:google.protobuf.Api.mixins) + return mixins_; +} // optional .google.protobuf.Syntax syntax = 7; inline void Api::clear_syntax() { @@ -845,16 +845,16 @@ inline ::google::protobuf::Option* Method::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Method.options) return options_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Method::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Method.options) - return options_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Method::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Method.options) return &options_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Method::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Method.options) + return options_; +} // optional .google.protobuf.Syntax syntax = 7; inline void Method::clear_syntax() { diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index f06be4a3d7..074a9e5411 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -32,6 +32,9 @@ #define GOOGLE_PROTOBUF_ARENA_H__ #include +#ifdef max +#undef max // Visual Studio defines this macro +#endif #if __cplusplus >= 201103L #include #endif diff --git a/src/google/protobuf/compiler/cpp/cpp_unittest.cc b/src/google/protobuf/compiler/cpp/cpp_unittest.cc index e5ef6ecd48..7840cfaff6 100644 --- a/src/google/protobuf/compiler/cpp/cpp_unittest.cc +++ b/src/google/protobuf/compiler/cpp/cpp_unittest.cc @@ -55,7 +55,9 @@ #include #include #include +#if !defined(_MSC_VER) // Too large for visual studio to compile #include +#endif #include #include #include @@ -133,6 +135,7 @@ TEST(GeneratedDescriptorTest, IdenticalDescriptors) { generated_decsriptor_proto.DebugString()); } +#if !defined(_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 @@ -143,6 +146,7 @@ TEST(GeneratedDescriptorTest, EnormousDescriptor) { EXPECT_TRUE(generated_descriptor != NULL); } +#endif #endif // !PROTOBUF_TEST_NO_DESCRIPTORS diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index 994bc392fd..0792d875b6 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -340,10 +340,10 @@ void CodeGeneratorRequest::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.compiler.CodeGeneratorRequest) // repeated string file_to_generate = 1; for (int i = 0; i < this->file_to_generate_size(); i++) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->file_to_generate(i).data(), this->file_to_generate(i).length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.compiler.CodeGeneratorRequest.file_to_generate"); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->file_to_generate(i).data(), this->file_to_generate(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.compiler.CodeGeneratorRequest.file_to_generate"); ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->file_to_generate(i), output); } diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 6f9905aa97..fe23c0abf6 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -1466,10 +1466,10 @@ void FileDescriptorProto::SerializeWithCachedSizes( // repeated string dependency = 3; for (int i = 0; i < this->dependency_size(); i++) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->dependency(i).data(), this->dependency(i).length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.FileDescriptorProto.dependency"); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->dependency(i).data(), this->dependency(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.FileDescriptorProto.dependency"); ::google::protobuf::internal::WireFormatLite::WriteString( 3, this->dependency(i), output); } @@ -3269,10 +3269,10 @@ void DescriptorProto::SerializeWithCachedSizes( // repeated string reserved_name = 10; for (int i = 0; i < this->reserved_name_size(); i++) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->reserved_name(i).data(), this->reserved_name(i).length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.DescriptorProto.reserved_name"); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->reserved_name(i).data(), this->reserved_name(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.DescriptorProto.reserved_name"); ::google::protobuf::internal::WireFormatLite::WriteString( 10, this->reserved_name(i), output); } @@ -13221,10 +13221,10 @@ void SourceCodeInfo_Location::SerializeWithCachedSizes( // repeated string leading_detached_comments = 6; for (int i = 0; i < this->leading_detached_comments_size(); i++) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); ::google::protobuf::internal::WireFormatLite::WriteString( 6, this->leading_detached_comments(i), output); } diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 0537057d79..d8f4ee916e 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -193,11 +193,11 @@ bool FieldMask::MergePartialFromCodedStream( parse_paths: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->add_paths())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->paths(this->paths_size() - 1).data(), this->paths(this->paths_size() - 1).length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.FieldMask.paths"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.FieldMask.paths")); } else { goto handle_unusual; } @@ -232,10 +232,10 @@ void FieldMask::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.FieldMask) // repeated string paths = 1; for (int i = 0; i < this->paths_size(); i++) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->paths(i).data(), this->paths(i).length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.FieldMask.paths"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->paths(i).data(), this->paths(i).length(), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.protobuf.FieldMask.paths"); ::google::protobuf::internal::WireFormatLite::WriteString( 1, this->paths(i), output); } @@ -248,9 +248,9 @@ void FieldMask::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldMask) // repeated string paths = 1; for (int i = 0; i < this->paths_size(); i++) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->paths(i).data(), this->paths(i).length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.FieldMask.paths"); target = ::google::protobuf::internal::WireFormatLite:: WriteStringToArray(1, this->paths(i), target); diff --git a/src/google/protobuf/generated_message_reflection.h b/src/google/protobuf/generated_message_reflection.h index 85ce6e2eec..9ef7871075 100644 --- a/src/google/protobuf/generated_message_reflection.h +++ b/src/google/protobuf/generated_message_reflection.h @@ -417,12 +417,12 @@ class LIBPROTOBUF_EXPORT GeneratedMessageReflection : public Reflection { protected: void* MutableRawRepeatedField( Message* message, const FieldDescriptor* field, FieldDescriptor::CppType, - int ctype, const Descriptor* desc) const override; + int ctype, const Descriptor* desc) const; const void* GetRawRepeatedField( const Message& message, const FieldDescriptor* field, FieldDescriptor::CppType, int ctype, - const Descriptor* desc) const override; + const Descriptor* desc) const; virtual MessageFactory* GetMessageFactory() const; diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index c43df13ed7..8b61573dfa 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -592,7 +592,7 @@ class Map { typedef MapAllocator*> > Allocator; // Iterators - class LIBPROTOBUF_EXPORT const_iterator + class const_iterator : public std::iterator { typedef typename hash_map, equal_to, @@ -853,6 +853,29 @@ struct hash { return 0; } } + bool + operator()(const google::protobuf::MapKey& map_key1, + const google::protobuf::MapKey& map_key2) const { + switch (map_key1.type()) { +#define COMPARE_CPPTYPE(CPPTYPE, CPPTYPE_METHOD) \ + case google::protobuf::FieldDescriptor::CPPTYPE_##CPPTYPE: \ + return map_key1.Get##CPPTYPE_METHOD##Value() < \ + map_key2.Get##CPPTYPE_METHOD##Value(); + COMPARE_CPPTYPE(STRING, String) + COMPARE_CPPTYPE(INT64, Int64) + COMPARE_CPPTYPE(INT32, Int32) + COMPARE_CPPTYPE(UINT64, UInt64) + COMPARE_CPPTYPE(UINT32, UInt32) + COMPARE_CPPTYPE(BOOL, Bool) +#undef COMPARE_CPPTYPE + case google::protobuf::FieldDescriptor::CPPTYPE_DOUBLE: + case google::protobuf::FieldDescriptor::CPPTYPE_FLOAT: + case google::protobuf::FieldDescriptor::CPPTYPE_ENUM: + case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE: + GOOGLE_LOG(FATAL) << "Can't get here."; + return true; + } + } }; GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END diff --git a/src/google/protobuf/map_entry_lite.h b/src/google/protobuf/map_entry_lite.h index 0e6ee013e3..7cdf1b9379 100644 --- a/src/google/protobuf/map_entry_lite.h +++ b/src/google/protobuf/map_entry_lite.h @@ -292,7 +292,7 @@ class MapEntryLite : public MessageLite { // only takes references of given key and value. template - class LIBPROTOBUF_EXPORT MapEntryWrapper + class MapEntryWrapper : public MapEntryLite { typedef MapEntryLite Base; typedef typename Base::KeyMapEntryAccessorType KeyMapEntryAccessorType; @@ -326,7 +326,7 @@ class MapEntryLite : public MessageLite { // the temporary. template - class LIBPROTOBUF_EXPORT MapEnumEntryWrapper + class MapEnumEntryWrapper : public MapEntryLite { typedef MapEntryLite Base; typedef typename Base::KeyMapEntryAccessorType KeyMapEntryAccessorType; diff --git a/src/google/protobuf/map_field.cc b/src/google/protobuf/map_field.cc index d8879f24e9..eddc95c4ca 100644 --- a/src/google/protobuf/map_field.cc +++ b/src/google/protobuf/map_field.cc @@ -160,7 +160,7 @@ DynamicMapField::DynamicMapField(const Message* default_entry, DynamicMapField::~DynamicMapField() { // DynamicMapField owns map values. Need to delete them before clearing // the map. - for (typename Map::iterator iter = map_.begin(); + for (Map::iterator iter = map_.begin(); iter != map_.end(); ++iter) { iter->second.DeleteData(); } @@ -174,7 +174,7 @@ int DynamicMapField::size() const { bool DynamicMapField::ContainsMapKey( const MapKey& map_key) const { const Map& map = GetMap(); - typename Map::const_iterator iter = map.find(map_key); + Map::const_iterator iter = map.find(map_key); return iter != map.end(); } @@ -246,7 +246,7 @@ Map* DynamicMapField::MutableMap() { } void DynamicMapField::SetMapIteratorValue(MapIterator* map_iter) const { - typename Map::const_iterator iter = + Map::const_iterator iter = TypeDefinedMapFieldBase::InternalGetIterator( map_iter); if (iter == map_.end()) return; @@ -272,7 +272,7 @@ void DynamicMapField::SyncRepeatedFieldWithMapNoLock() const { MapFieldBase::repeated_field_->Clear(); - for (typename Map::const_iterator it = map_.begin(); + for (Map::const_iterator it = map_.begin(); it != map_.end(); ++it) { Message* new_entry = default_entry_->New(); MapFieldBase::repeated_field_->AddAllocated(new_entry); @@ -350,12 +350,12 @@ void DynamicMapField::SyncMapWithRepeatedFieldNoLock() const { default_entry_->GetDescriptor()->FindFieldByName("value"); // DynamicMapField owns map values. Need to delete them before clearing // the map. - for (typename Map::iterator iter = map->begin(); + for (Map::iterator iter = map->begin(); iter != map->end(); ++iter) { iter->second.DeleteData(); } map->clear(); - for (typename RepeatedPtrField::iterator it = + for (RepeatedPtrField::iterator it = MapFieldBase::repeated_field_->begin(); it != MapFieldBase::repeated_field_->end(); ++it) { MapKey map_key; @@ -424,7 +424,7 @@ int DynamicMapField::SpaceUsedExcludingSelfNoLock() const { size += sizeof(map_); int map_size = map_.size(); if (map_size) { - typename Map::const_iterator it = map_.begin(); + Map::const_iterator it = map_.begin(); size += sizeof(it->first) * map_size; size += sizeof(it->second) * map_size; // If key is string, add the allocated space. diff --git a/src/google/protobuf/map_field_inl.h b/src/google/protobuf/map_field_inl.h index 1a4ce93768..16c4a08ffc 100644 --- a/src/google/protobuf/map_field_inl.h +++ b/src/google/protobuf/map_field_inl.h @@ -153,7 +153,9 @@ void TypeDefinedMapFieldBase::CopyIterator( const MapIterator& that_iter) const { InternalGetIterator(this_iter) = InternalGetIterator(&that_iter); this_iter->key_.SetType(that_iter.key_.type()); - this_iter->value_.SetType(that_iter.value_.type()); + // MapValueRef::type() fails when containing data is null. However, if + // this_iter points to MapEnd, data can be null. + this_iter->value_.SetType((FieldDescriptor::CppType)that_iter.value_.type_); SetMapIteratorValue(this_iter); } diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index 3369e47710..c83976396e 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -194,10 +194,10 @@ bool SourceContext::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_file_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->file_name().data(), this->file_name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.SourceContext.file_name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.SourceContext.file_name")); } else { goto handle_unusual; } @@ -231,9 +231,9 @@ void SourceContext::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.SourceContext) // optional string file_name = 1; if (this->file_name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->file_name().data(), this->file_name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.SourceContext.file_name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->file_name(), output); @@ -247,9 +247,9 @@ void SourceContext::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceContext) // optional string file_name = 1; if (this->file_name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->file_name().data(), this->file_name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.SourceContext.file_name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index a7e2eafd4b..c2b27c4c11 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -301,6 +301,10 @@ bool Struct::MergePartialFromCodedStream( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, entry.get())); (*mutable_fields())[entry->key()].Swap(entry->mutable_value()); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + entry->key().data(), entry->key().length(), + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Struct.FieldsEntry.key")); } else { goto handle_unusual; } @@ -343,6 +347,10 @@ void Struct::SerializeWithCachedSizes( entry.reset(fields_.NewEntryWrapper(it->first, it->second)); ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 1, *entry, output); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + it->first.data(), it->first.length(), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.protobuf.Struct.FieldsEntry.key"); } } @@ -362,6 +370,10 @@ void Struct::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( 1, *entry, target); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + it->first.data(), it->first.length(), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.protobuf.Struct.FieldsEntry.key"); } } @@ -547,6 +559,7 @@ Value* Value::New(::google::protobuf::Arena* arena) const { } void Value::clear_kind() { + typedef Value T; switch(kind_case()) { case kNullValue: { // No need to clear @@ -631,10 +644,10 @@ bool Value::MergePartialFromCodedStream( parse_string_value: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_string_value())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->string_value().data(), this->string_value().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Value.string_value"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Value.string_value")); } else { goto handle_unusual; } @@ -721,9 +734,9 @@ void Value::SerializeWithCachedSizes( // optional string string_value = 3; if (has_string_value()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->string_value().data(), this->string_value().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Value.string_value"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 3, this->string_value(), output); @@ -765,9 +778,9 @@ void Value::SerializeWithCachedSizes( // optional string string_value = 3; if (has_string_value()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->string_value().data(), this->string_value().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Value.string_value"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -1114,10 +1127,11 @@ void Value::clear_struct_value() { } const ::google::protobuf::Struct& Value::struct_value() const { // @@protoc_insertion_point(field_get:google.protobuf.Value.struct_value) - return has_struct_value() ? *kind_.struct_value_ - : ::google::protobuf::Struct::default_instance(); + return has_struct_value() + ? *kind_.struct_value_ + : ::google::protobuf::Struct::default_instance(); } - ::google::protobuf::Struct* Value::mutable_struct_value() { +::google::protobuf::Struct* Value::mutable_struct_value() { if (!has_struct_value()) { clear_kind(); set_has_struct_value(); @@ -1126,7 +1140,7 @@ void Value::clear_struct_value() { // @@protoc_insertion_point(field_mutable:google.protobuf.Value.struct_value) return kind_.struct_value_; } - ::google::protobuf::Struct* Value::release_struct_value() { +::google::protobuf::Struct* Value::release_struct_value() { if (has_struct_value()) { clear_has_kind(); ::google::protobuf::Struct* temp = kind_.struct_value_; @@ -1136,7 +1150,7 @@ void Value::clear_struct_value() { return NULL; } } - void Value::set_allocated_struct_value(::google::protobuf::Struct* struct_value) { +void Value::set_allocated_struct_value(::google::protobuf::Struct* struct_value) { clear_kind(); if (struct_value) { set_has_struct_value(); @@ -1160,10 +1174,11 @@ void Value::clear_list_value() { } const ::google::protobuf::ListValue& Value::list_value() const { // @@protoc_insertion_point(field_get:google.protobuf.Value.list_value) - return has_list_value() ? *kind_.list_value_ - : ::google::protobuf::ListValue::default_instance(); + return has_list_value() + ? *kind_.list_value_ + : ::google::protobuf::ListValue::default_instance(); } - ::google::protobuf::ListValue* Value::mutable_list_value() { +::google::protobuf::ListValue* Value::mutable_list_value() { if (!has_list_value()) { clear_kind(); set_has_list_value(); @@ -1172,7 +1187,7 @@ void Value::clear_list_value() { // @@protoc_insertion_point(field_mutable:google.protobuf.Value.list_value) return kind_.list_value_; } - ::google::protobuf::ListValue* Value::release_list_value() { +::google::protobuf::ListValue* Value::release_list_value() { if (has_list_value()) { clear_has_kind(); ::google::protobuf::ListValue* temp = kind_.list_value_; @@ -1182,7 +1197,7 @@ void Value::clear_list_value() { return NULL; } } - void Value::set_allocated_list_value(::google::protobuf::ListValue* list_value) { +void Value::set_allocated_list_value(::google::protobuf::ListValue* list_value) { clear_kind(); if (list_value) { set_has_list_value(); @@ -1422,28 +1437,28 @@ int ListValue::values_size() const { void ListValue::clear_values() { values_.Clear(); } - const ::google::protobuf::Value& ListValue::values(int index) const { +const ::google::protobuf::Value& ListValue::values(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.ListValue.values) return values_.Get(index); } - ::google::protobuf::Value* ListValue::mutable_values(int index) { +::google::protobuf::Value* ListValue::mutable_values(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.ListValue.values) return values_.Mutable(index); } - ::google::protobuf::Value* ListValue::add_values() { +::google::protobuf::Value* ListValue::add_values() { // @@protoc_insertion_point(field_add:google.protobuf.ListValue.values) return values_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >& -ListValue::values() const { - // @@protoc_insertion_point(field_list:google.protobuf.ListValue.values) - return values_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >* ListValue::mutable_values() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.ListValue.values) return &values_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >& +ListValue::values() const { + // @@protoc_insertion_point(field_list:google.protobuf.ListValue.values) + return values_; +} #endif // PROTOBUF_INLINE_NOT_IN_HEADERS diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 2889c8fe1a..0527c8124e 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -40,9 +40,9 @@ void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fstruct_2eproto(); void protobuf_AssignDesc_google_2fprotobuf_2fstruct_2eproto(); void protobuf_ShutdownFile_google_2fprotobuf_2fstruct_2eproto(); +class ListValue; class Struct; class Value; -class ListValue; enum NullValue { NULL_VALUE = 0, @@ -383,10 +383,10 @@ class LIBPROTOBUF_EXPORT ListValue : public ::google::protobuf::Message { const ::google::protobuf::Value& values(int index) const; ::google::protobuf::Value* mutable_values(int index); ::google::protobuf::Value* add_values(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >& - values() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >* mutable_values(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >& + values() const; // @@protoc_insertion_point(class_scope:google.protobuf.ListValue) private: @@ -612,10 +612,11 @@ inline void Value::clear_struct_value() { clear_has_kind(); } } -inline const ::google::protobuf::Struct& Value::struct_value() const { +inline const ::google::protobuf::Struct& Value::struct_value() const { // @@protoc_insertion_point(field_get:google.protobuf.Value.struct_value) - return has_struct_value() ? *kind_.struct_value_ - : ::google::protobuf::Struct::default_instance(); + return has_struct_value() + ? *kind_.struct_value_ + : ::google::protobuf::Struct::default_instance(); } inline ::google::protobuf::Struct* Value::mutable_struct_value() { if (!has_struct_value()) { @@ -658,10 +659,11 @@ inline void Value::clear_list_value() { clear_has_kind(); } } -inline const ::google::protobuf::ListValue& Value::list_value() const { +inline const ::google::protobuf::ListValue& Value::list_value() const { // @@protoc_insertion_point(field_get:google.protobuf.Value.list_value) - return has_list_value() ? *kind_.list_value_ - : ::google::protobuf::ListValue::default_instance(); + return has_list_value() + ? *kind_.list_value_ + : ::google::protobuf::ListValue::default_instance(); } inline ::google::protobuf::ListValue* Value::mutable_list_value() { if (!has_list_value()) { @@ -723,16 +725,16 @@ inline ::google::protobuf::Value* ListValue::add_values() { // @@protoc_insertion_point(field_add:google.protobuf.ListValue.values) return values_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >& -ListValue::values() const { - // @@protoc_insertion_point(field_list:google.protobuf.ListValue.values) - return values_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >* ListValue::mutable_values() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.ListValue.values) return &values_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Value >& +ListValue::values() const { + // @@protoc_insertion_point(field_list:google.protobuf.ListValue.values) + return values_; +} #endif // !PROTOBUF_INLINE_NOT_IN_HEADERS // ------------------------------------------------------------------- diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index 0d94ad80d2..c6f210f0f7 100755 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -103,8 +103,8 @@ # define GOOGLE_PROTOBUF_HAS_CXX11_HASH # define GOOGLE_PROTOBUF_HASH_COMPARE std::hash_compare # elif _MSC_VER >= 1500 // Since Visual Studio 2008 -# define GOOGLE_PROTOBUF_HAS_TR1 -# define GOOGLE_PROTOBUF_HASH_COMPARE stdext::hash_compare +# undef GOOGLE_PROTOBUF_HAVE_HASH_MAP +# undef GOOGLE_PROTOBUF_HAVE_HASH_SET # elif _MSC_VER >= 1310 # define GOOGLE_PROTOBUF_HASH_NAMESPACE stdext # include @@ -143,20 +143,10 @@ # define GOOGLE_PROTOBUF_HASH_SET_CLASS unordered_set #endif -#ifndef GOOGLE_PROTOBUF_HASH_NAMESPACE -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END -#elif !defined(GOOGLE_PROTOBUF_HAS_CXX11_HASH) && \ - defined(GOOGLE_PROTOBUF_HAS_TR1) -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START \ - namespace std { \ - namespace tr1 { +# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START \ + namespace google { \ + namespace protobuf { # define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END }} -#else -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START \ - namespace GOOGLE_PROTOBUF_HASH_NAMESPACE { -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END } -#endif #undef GOOGLE_PROTOBUF_HAS_CXX11_HASH #undef GOOGLE_PROTOBUF_HAS_TR1 diff --git a/src/google/protobuf/stubs/int128.h b/src/google/protobuf/stubs/int128.h index 1e63037f0a..1499bb76d5 100644 --- a/src/google/protobuf/stubs/int128.h +++ b/src/google/protobuf/stubs/int128.h @@ -48,7 +48,7 @@ struct uint128_pod; #endif // An unsigned 128-bit integer type. Thread-compatible. -class uint128 { +class LIBPROTOBUF_EXPORT uint128 { public: UINT128_CONSTEXPR uint128(); // Sets to 0, but don't trust on this behavior. UINT128_CONSTEXPR uint128(uint64 top, uint64 bottom); @@ -84,7 +84,8 @@ class uint128 { friend uint64 Uint128High64(const uint128& v); // We add "std::" to avoid including all of port.h. - friend std::ostream& operator<<(std::ostream& o, const uint128& b); + LIBPROTOBUF_EXPORT friend std::ostream& operator<<(std::ostream& o, + const uint128& b); private: static void DivModImpl(uint128 dividend, uint128 divisor, @@ -115,10 +116,11 @@ struct uint128_pod { uint64 lo; }; -extern const uint128_pod kuint128max; +LIBPROTOBUF_EXPORT extern const uint128_pod kuint128max; // allow uint128 to be logged -extern std::ostream& operator<<(std::ostream& o, const uint128& b); +LIBPROTOBUF_EXPORT extern std::ostream& operator<<(std::ostream& o, + const uint128& b); // Methods to access low and high pieces of 128-bit value. // Defined externally from uint128 to facilitate conversion diff --git a/src/google/protobuf/stubs/mathutil.h b/src/google/protobuf/stubs/mathutil.h index 99c4d452f7..3a1ef8a8cb 100644 --- a/src/google/protobuf/stubs/mathutil.h +++ b/src/google/protobuf/stubs/mathutil.h @@ -45,9 +45,21 @@ bool IsNan(T value) { return false; } template<> -inline bool IsNan(float value) { return isnan(value); } +inline bool IsNan(float value) { +#ifdef _MSC_VER + return _isnan(value); +#else + return isnan(value); +#endif +} template<> -inline bool IsNan(double value) { return isnan(value); } +inline bool IsNan(double value) { +#ifdef _MSC_VER + return _isnan(value); +#else + return isnan(value); +#endif +} template bool AlmostEquals(T a, T b) { diff --git a/src/google/protobuf/stubs/status.cc b/src/google/protobuf/stubs/status.cc index 7314c563c9..dd1bd6141a 100644 --- a/src/google/protobuf/stubs/status.cc +++ b/src/google/protobuf/stubs/status.cc @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 395553c628..8f99356152 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -381,10 +381,10 @@ bool Type::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Type.name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Type.name")); } else { goto handle_unusual; } @@ -415,11 +415,11 @@ bool Type::MergePartialFromCodedStream( parse_oneofs: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->add_oneofs())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->oneofs(this->oneofs_size() - 1).data(), this->oneofs(this->oneofs_size() - 1).length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Type.oneofs"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Type.oneofs")); } else { goto handle_unusual; } @@ -500,9 +500,9 @@ void Type::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.Type) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Type.name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->name(), output); @@ -516,10 +516,10 @@ void Type::SerializeWithCachedSizes( // repeated string oneofs = 3; for (int i = 0; i < this->oneofs_size(); i++) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->oneofs(i).data(), this->oneofs(i).length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.Type.oneofs"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->oneofs(i).data(), this->oneofs(i).length(), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "google.protobuf.Type.oneofs"); ::google::protobuf::internal::WireFormatLite::WriteString( 3, this->oneofs(i), output); } @@ -550,9 +550,9 @@ void Type::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Type) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Type.name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -568,9 +568,9 @@ void Type::SerializeWithCachedSizes( // repeated string oneofs = 3; for (int i = 0; i < this->oneofs_size(); i++) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->oneofs(i).data(), this->oneofs(i).length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Type.oneofs"); target = ::google::protobuf::internal::WireFormatLite:: WriteStringToArray(3, this->oneofs(i), target); @@ -774,28 +774,28 @@ int Type::fields_size() const { void Type::clear_fields() { fields_.Clear(); } - const ::google::protobuf::Field& Type::fields(int index) const { +const ::google::protobuf::Field& Type::fields(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Type.fields) return fields_.Get(index); } - ::google::protobuf::Field* Type::mutable_fields(int index) { +::google::protobuf::Field* Type::mutable_fields(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Type.fields) return fields_.Mutable(index); } - ::google::protobuf::Field* Type::add_fields() { +::google::protobuf::Field* Type::add_fields() { // @@protoc_insertion_point(field_add:google.protobuf.Type.fields) return fields_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >& -Type::fields() const { - // @@protoc_insertion_point(field_list:google.protobuf.Type.fields) - return fields_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >* Type::mutable_fields() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.fields) return &fields_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >& +Type::fields() const { + // @@protoc_insertion_point(field_list:google.protobuf.Type.fields) + return fields_; +} // repeated string oneofs = 3; int Type::oneofs_size() const { @@ -858,28 +858,28 @@ int Type::options_size() const { void Type::clear_options() { options_.Clear(); } - const ::google::protobuf::Option& Type::options(int index) const { +const ::google::protobuf::Option& Type::options(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Type.options) return options_.Get(index); } - ::google::protobuf::Option* Type::mutable_options(int index) { +::google::protobuf::Option* Type::mutable_options(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Type.options) return options_.Mutable(index); } - ::google::protobuf::Option* Type::add_options() { +::google::protobuf::Option* Type::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Type.options) return options_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Type::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Type.options) - return options_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Type::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.options) return &options_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Type::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Type.options) + return options_; +} // optional .google.protobuf.SourceContext source_context = 5; bool Type::has_source_context() const { @@ -889,11 +889,11 @@ void Type::clear_source_context() { if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_; source_context_ = NULL; } - const ::google::protobuf::SourceContext& Type::source_context() const { +const ::google::protobuf::SourceContext& Type::source_context() const { // @@protoc_insertion_point(field_get:google.protobuf.Type.source_context) return source_context_ != NULL ? *source_context_ : *default_instance_->source_context_; } - ::google::protobuf::SourceContext* Type::mutable_source_context() { +::google::protobuf::SourceContext* Type::mutable_source_context() { if (source_context_ == NULL) { source_context_ = new ::google::protobuf::SourceContext; @@ -901,13 +901,13 @@ void Type::clear_source_context() { // @@protoc_insertion_point(field_mutable:google.protobuf.Type.source_context) return source_context_; } - ::google::protobuf::SourceContext* Type::release_source_context() { +::google::protobuf::SourceContext* Type::release_source_context() { ::google::protobuf::SourceContext* temp = source_context_; source_context_ = NULL; return temp; } - void Type::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { +void Type::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { delete source_context_; source_context_ = source_context; if (source_context) { @@ -1182,10 +1182,10 @@ bool Field::MergePartialFromCodedStream( parse_name: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Field.name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Field.name")); } else { goto handle_unusual; } @@ -1199,10 +1199,10 @@ bool Field::MergePartialFromCodedStream( parse_type_url: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_type_url())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->type_url().data(), this->type_url().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Field.type_url"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Field.type_url")); } else { goto handle_unusual; } @@ -1263,10 +1263,10 @@ bool Field::MergePartialFromCodedStream( parse_json_name: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_json_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->json_name().data(), this->json_name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Field.json_name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Field.json_name")); } else { goto handle_unusual; } @@ -1317,9 +1317,9 @@ void Field::SerializeWithCachedSizes( // optional string name = 4; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 4, this->name(), output); @@ -1327,9 +1327,9 @@ void Field::SerializeWithCachedSizes( // optional string type_url = 6; if (this->type_url().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->type_url().data(), this->type_url().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.type_url"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 6, this->type_url(), output); @@ -1353,9 +1353,9 @@ void Field::SerializeWithCachedSizes( // optional string json_name = 10; if (this->json_name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->json_name().data(), this->json_name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.json_name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 10, this->json_name(), output); @@ -1386,9 +1386,9 @@ void Field::SerializeWithCachedSizes( // optional string name = 4; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -1397,9 +1397,9 @@ void Field::SerializeWithCachedSizes( // optional string type_url = 6; if (this->type_url().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->type_url().data(), this->type_url().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.type_url"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -1425,9 +1425,9 @@ void Field::SerializeWithCachedSizes( // optional string json_name = 10; if (this->json_name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->json_name().data(), this->json_name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Field.json_name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -1760,28 +1760,28 @@ int Field::options_size() const { void Field::clear_options() { options_.Clear(); } - const ::google::protobuf::Option& Field::options(int index) const { +const ::google::protobuf::Option& Field::options(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Field.options) return options_.Get(index); } - ::google::protobuf::Option* Field::mutable_options(int index) { +::google::protobuf::Option* Field::mutable_options(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Field.options) return options_.Mutable(index); } - ::google::protobuf::Option* Field::add_options() { +::google::protobuf::Option* Field::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Field.options) return options_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Field::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Field.options) - return options_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Field::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Field.options) return &options_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Field::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Field.options) + return options_; +} // optional string json_name = 10; void Field::clear_json_name() { @@ -1927,10 +1927,10 @@ bool Enum::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Enum.name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Enum.name")); } else { goto handle_unusual; } @@ -2026,9 +2026,9 @@ void Enum::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.Enum) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Enum.name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->name(), output); @@ -2066,9 +2066,9 @@ void Enum::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Enum) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Enum.name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -2271,28 +2271,28 @@ int Enum::enumvalue_size() const { void Enum::clear_enumvalue() { enumvalue_.Clear(); } - const ::google::protobuf::EnumValue& Enum::enumvalue(int index) const { +const ::google::protobuf::EnumValue& Enum::enumvalue(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Enum.enumvalue) return enumvalue_.Get(index); } - ::google::protobuf::EnumValue* Enum::mutable_enumvalue(int index) { +::google::protobuf::EnumValue* Enum::mutable_enumvalue(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Enum.enumvalue) return enumvalue_.Mutable(index); } - ::google::protobuf::EnumValue* Enum::add_enumvalue() { +::google::protobuf::EnumValue* Enum::add_enumvalue() { // @@protoc_insertion_point(field_add:google.protobuf.Enum.enumvalue) return enumvalue_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >& -Enum::enumvalue() const { - // @@protoc_insertion_point(field_list:google.protobuf.Enum.enumvalue) - return enumvalue_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >* Enum::mutable_enumvalue() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.enumvalue) return &enumvalue_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >& +Enum::enumvalue() const { + // @@protoc_insertion_point(field_list:google.protobuf.Enum.enumvalue) + return enumvalue_; +} // repeated .google.protobuf.Option options = 3; int Enum::options_size() const { @@ -2301,28 +2301,28 @@ int Enum::options_size() const { void Enum::clear_options() { options_.Clear(); } - const ::google::protobuf::Option& Enum::options(int index) const { +const ::google::protobuf::Option& Enum::options(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.Enum.options) return options_.Get(index); } - ::google::protobuf::Option* Enum::mutable_options(int index) { +::google::protobuf::Option* Enum::mutable_options(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.Enum.options) return options_.Mutable(index); } - ::google::protobuf::Option* Enum::add_options() { +::google::protobuf::Option* Enum::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Enum.options) return options_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Enum::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Enum.options) - return options_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Enum::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.options) return &options_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Enum::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Enum.options) + return options_; +} // optional .google.protobuf.SourceContext source_context = 4; bool Enum::has_source_context() const { @@ -2332,11 +2332,11 @@ void Enum::clear_source_context() { if (GetArenaNoVirtual() == NULL && source_context_ != NULL) delete source_context_; source_context_ = NULL; } - const ::google::protobuf::SourceContext& Enum::source_context() const { +const ::google::protobuf::SourceContext& Enum::source_context() const { // @@protoc_insertion_point(field_get:google.protobuf.Enum.source_context) return source_context_ != NULL ? *source_context_ : *default_instance_->source_context_; } - ::google::protobuf::SourceContext* Enum::mutable_source_context() { +::google::protobuf::SourceContext* Enum::mutable_source_context() { if (source_context_ == NULL) { source_context_ = new ::google::protobuf::SourceContext; @@ -2344,13 +2344,13 @@ void Enum::clear_source_context() { // @@protoc_insertion_point(field_mutable:google.protobuf.Enum.source_context) return source_context_; } - ::google::protobuf::SourceContext* Enum::release_source_context() { +::google::protobuf::SourceContext* Enum::release_source_context() { ::google::protobuf::SourceContext* temp = source_context_; source_context_ = NULL; return temp; } - void Enum::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { +void Enum::set_allocated_source_context(::google::protobuf::SourceContext* source_context) { delete source_context_; source_context_ = source_context; if (source_context) { @@ -2468,10 +2468,10 @@ bool EnumValue::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.EnumValue.name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.EnumValue.name")); } else { goto handle_unusual; } @@ -2537,9 +2537,9 @@ void EnumValue::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.EnumValue) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.EnumValue.name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->name(), output); @@ -2564,9 +2564,9 @@ void EnumValue::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValue) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.EnumValue.name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -2748,28 +2748,28 @@ int EnumValue::options_size() const { void EnumValue::clear_options() { options_.Clear(); } - const ::google::protobuf::Option& EnumValue::options(int index) const { +const ::google::protobuf::Option& EnumValue::options(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.EnumValue.options) return options_.Get(index); } - ::google::protobuf::Option* EnumValue::mutable_options(int index) { +::google::protobuf::Option* EnumValue::mutable_options(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValue.options) return options_.Mutable(index); } - ::google::protobuf::Option* EnumValue::add_options() { +::google::protobuf::Option* EnumValue::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.EnumValue.options) return options_.Add(); } - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -EnumValue::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.EnumValue.options) - return options_; -} - ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* +::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* EnumValue::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValue.options) return &options_; } +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +EnumValue::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.EnumValue.options) + return options_; +} #endif // PROTOBUF_INLINE_NOT_IN_HEADERS @@ -2865,10 +2865,10 @@ bool Option::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.Option.name"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.Option.name")); } else { goto handle_unusual; } @@ -2915,9 +2915,9 @@ void Option::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.Option) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Option.name"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->name(), output); @@ -2937,9 +2937,9 @@ void Option::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Option) // optional string name = 1; if (this->name().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->name().data(), this->name().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.Option.name"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( @@ -3093,11 +3093,11 @@ void Option::clear_value() { if (GetArenaNoVirtual() == NULL && value_ != NULL) delete value_; value_ = NULL; } - const ::google::protobuf::Any& Option::value() const { +const ::google::protobuf::Any& Option::value() const { // @@protoc_insertion_point(field_get:google.protobuf.Option.value) return value_ != NULL ? *value_ : *default_instance_->value_; } - ::google::protobuf::Any* Option::mutable_value() { +::google::protobuf::Any* Option::mutable_value() { if (value_ == NULL) { value_ = new ::google::protobuf::Any; @@ -3105,13 +3105,13 @@ void Option::clear_value() { // @@protoc_insertion_point(field_mutable:google.protobuf.Option.value) return value_; } - ::google::protobuf::Any* Option::release_value() { +::google::protobuf::Any* Option::release_value() { ::google::protobuf::Any* temp = value_; value_ = NULL; return temp; } - void Option::set_allocated_value(::google::protobuf::Any* value) { +void Option::set_allocated_value(::google::protobuf::Any* value) { delete value_; value_ = value; if (value) { diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 0d0aa2fc36..deda921300 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -40,11 +40,11 @@ void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto(); void protobuf_AssignDesc_google_2fprotobuf_2ftype_2eproto(); void protobuf_ShutdownFile_google_2fprotobuf_2ftype_2eproto(); -class Type; -class Field; class Enum; class EnumValue; +class Field; class Option; +class Type; enum Field_Kind { Field_Kind_TYPE_UNKNOWN = 0, @@ -204,10 +204,10 @@ class LIBPROTOBUF_EXPORT Type : public ::google::protobuf::Message { const ::google::protobuf::Field& fields(int index) const; ::google::protobuf::Field* mutable_fields(int index); ::google::protobuf::Field* add_fields(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >& - fields() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >* mutable_fields(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >& + fields() const; // repeated string oneofs = 3; int oneofs_size() const; @@ -232,10 +232,10 @@ class LIBPROTOBUF_EXPORT Type : public ::google::protobuf::Message { const ::google::protobuf::Option& options(int index) const; ::google::protobuf::Option* mutable_options(int index); ::google::protobuf::Option* add_options(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& - options() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* mutable_options(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& + options() const; // optional .google.protobuf.SourceContext source_context = 5; bool has_source_context() const; @@ -455,10 +455,10 @@ class LIBPROTOBUF_EXPORT Field : public ::google::protobuf::Message { const ::google::protobuf::Option& options(int index) const; ::google::protobuf::Option* mutable_options(int index); ::google::protobuf::Option* add_options(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& - options() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* mutable_options(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& + options() const; // optional string json_name = 10; void clear_json_name(); @@ -569,10 +569,10 @@ class LIBPROTOBUF_EXPORT Enum : public ::google::protobuf::Message { const ::google::protobuf::EnumValue& enumvalue(int index) const; ::google::protobuf::EnumValue* mutable_enumvalue(int index); ::google::protobuf::EnumValue* add_enumvalue(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >& - enumvalue() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >* mutable_enumvalue(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >& + enumvalue() const; // repeated .google.protobuf.Option options = 3; int options_size() const; @@ -581,10 +581,10 @@ class LIBPROTOBUF_EXPORT Enum : public ::google::protobuf::Message { const ::google::protobuf::Option& options(int index) const; ::google::protobuf::Option* mutable_options(int index); ::google::protobuf::Option* add_options(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& - options() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* mutable_options(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& + options() const; // optional .google.protobuf.SourceContext source_context = 4; bool has_source_context() const; @@ -701,10 +701,10 @@ class LIBPROTOBUF_EXPORT EnumValue : public ::google::protobuf::Message { const ::google::protobuf::Option& options(int index) const; ::google::protobuf::Option* mutable_options(int index); ::google::protobuf::Option* add_options(); - const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& - options() const; ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* mutable_options(); + const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& + options() const; // @@protoc_insertion_point(class_scope:google.protobuf.EnumValue) private: @@ -885,16 +885,16 @@ inline ::google::protobuf::Field* Type::add_fields() { // @@protoc_insertion_point(field_add:google.protobuf.Type.fields) return fields_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >& -Type::fields() const { - // @@protoc_insertion_point(field_list:google.protobuf.Type.fields) - return fields_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >* Type::mutable_fields() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.fields) return &fields_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Field >& +Type::fields() const { + // @@protoc_insertion_point(field_list:google.protobuf.Type.fields) + return fields_; +} // repeated string oneofs = 3; inline int Type::oneofs_size() const { @@ -969,16 +969,16 @@ inline ::google::protobuf::Option* Type::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Type.options) return options_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Type::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Type.options) - return options_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Type::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.options) return &options_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Type::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Type.options) + return options_; +} // optional .google.protobuf.SourceContext source_context = 5; inline bool Type::has_source_context() const { @@ -1210,16 +1210,16 @@ inline ::google::protobuf::Option* Field::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Field.options) return options_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Field::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Field.options) - return options_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Field::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Field.options) return &options_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Field::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Field.options) + return options_; +} // optional string json_name = 10; inline void Field::clear_json_name() { @@ -1330,16 +1330,16 @@ inline ::google::protobuf::EnumValue* Enum::add_enumvalue() { // @@protoc_insertion_point(field_add:google.protobuf.Enum.enumvalue) return enumvalue_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >& -Enum::enumvalue() const { - // @@protoc_insertion_point(field_list:google.protobuf.Enum.enumvalue) - return enumvalue_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >* Enum::mutable_enumvalue() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.enumvalue) return &enumvalue_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::EnumValue >& +Enum::enumvalue() const { + // @@protoc_insertion_point(field_list:google.protobuf.Enum.enumvalue) + return enumvalue_; +} // repeated .google.protobuf.Option options = 3; inline int Enum::options_size() const { @@ -1360,16 +1360,16 @@ inline ::google::protobuf::Option* Enum::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.Enum.options) return options_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -Enum::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.Enum.options) - return options_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* Enum::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.options) return &options_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +Enum::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.Enum.options) + return options_; +} // optional .google.protobuf.SourceContext source_context = 4; inline bool Enum::has_source_context() const { @@ -1502,16 +1502,16 @@ inline ::google::protobuf::Option* EnumValue::add_options() { // @@protoc_insertion_point(field_add:google.protobuf.EnumValue.options) return options_.Add(); } -inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& -EnumValue::options() const { - // @@protoc_insertion_point(field_list:google.protobuf.EnumValue.options) - return options_; -} inline ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >* EnumValue::mutable_options() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValue.options) return &options_; } +inline const ::google::protobuf::RepeatedPtrField< ::google::protobuf::Option >& +EnumValue::options() const { + // @@protoc_insertion_point(field_list:google.protobuf.EnumValue.options) + return options_; +} // ------------------------------------------------------------------- diff --git a/src/google/protobuf/util/internal/datapiece.h b/src/google/protobuf/util/internal/datapiece.h index 30947252ce..2ab3fa8864 100644 --- a/src/google/protobuf/util/internal/datapiece.h +++ b/src/google/protobuf/util/internal/datapiece.h @@ -193,13 +193,13 @@ class LIBPROTOBUF_EXPORT DataPiece { // Stored piece of data. union { - const int32 i32_; - const int64 i64_; - const uint32 u32_; - const uint64 u64_; - const double double_; - const float float_; - const bool bool_; + int32 i32_; + int64 i64_; + uint32 u32_; + uint64 u64_; + double double_; + float float_; + bool bool_; StringPiecePod str_; }; }; diff --git a/src/google/protobuf/util/internal/default_value_objectwriter.h b/src/google/protobuf/util/internal/default_value_objectwriter.h index 2468c8d913..d454760170 100644 --- a/src/google/protobuf/util/internal/default_value_objectwriter.h +++ b/src/google/protobuf/util/internal/default_value_objectwriter.h @@ -57,7 +57,7 @@ namespace converter { // ObjectWriter when EndObject() is called on the root object. It also writes // out all non-repeated primitive fields that haven't been explicitly rendered // with their default values (0 for numbers, "" for strings, etc). -class DefaultValueObjectWriter : public ObjectWriter { +class LIBPROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter { public: DefaultValueObjectWriter(TypeResolver* type_resolver, const google::protobuf::Type& type, diff --git a/src/google/protobuf/util/internal/json_objectwriter.cc b/src/google/protobuf/util/internal/json_objectwriter.cc index d88a81f9d3..f81e3306ac 100644 --- a/src/google/protobuf/util/internal/json_objectwriter.cc +++ b/src/google/protobuf/util/internal/json_objectwriter.cc @@ -37,6 +37,7 @@ #include #include #include +#include #include namespace google { @@ -115,7 +116,9 @@ JsonObjectWriter* JsonObjectWriter::RenderUint64(StringPiece name, JsonObjectWriter* JsonObjectWriter::RenderDouble(StringPiece name, double value) { - if (isfinite(value)) return RenderSimple(name, SimpleDtoa(value)); + if (google::protobuf::MathLimits::IsFinite(value)) { + return RenderSimple(name, SimpleDtoa(value)); + } // Render quoted with NaN/Infinity-aware DoubleAsString. return RenderString(name, DoubleAsString(value)); @@ -123,7 +126,9 @@ JsonObjectWriter* JsonObjectWriter::RenderDouble(StringPiece name, JsonObjectWriter* JsonObjectWriter::RenderFloat(StringPiece name, float value) { - if (isfinite(value)) return RenderSimple(name, SimpleFtoa(value)); + if (google::protobuf::MathLimits::IsFinite(value)) { + return RenderSimple(name, SimpleFtoa(value)); + } // Render quoted with NaN/Infinity-aware FloatAsString. return RenderString(name, FloatAsString(value)); diff --git a/src/google/protobuf/util/internal/type_info.h b/src/google/protobuf/util/internal/type_info.h index e394e8cfde..d81331763a 100644 --- a/src/google/protobuf/util/internal/type_info.h +++ b/src/google/protobuf/util/internal/type_info.h @@ -44,7 +44,7 @@ namespace util { namespace converter { // Internal helper class for type resolving. Note that this class is not // thread-safe and should only be accessed in one thread. -class TypeInfo { +class LIBPROTOBUF_EXPORT TypeInfo { public: TypeInfo() {} virtual ~TypeInfo() {} diff --git a/src/google/protobuf/util/internal/utility.cc b/src/google/protobuf/util/internal/utility.cc index 2d63de00e9..d4ac6f779e 100644 --- a/src/google/protobuf/util/internal/utility.cc +++ b/src/google/protobuf/util/internal/utility.cc @@ -311,7 +311,7 @@ string DoubleAsString(double value) { } string FloatAsString(float value) { - if (isfinite(value)) return SimpleFtoa(value); + if (google::protobuf::MathLimits::IsFinite(value)) return SimpleFtoa(value); return DoubleAsString(value); } diff --git a/src/google/protobuf/util/json_util.h b/src/google/protobuf/util/json_util.h index 614564cc1a..1718bfb528 100644 --- a/src/google/protobuf/util/json_util.h +++ b/src/google/protobuf/util/json_util.h @@ -80,7 +80,7 @@ inline util::Status BinaryToJsonStream( JsonOptions()); } -util::Status BinaryToJsonString( +LIBPROTOBUF_EXPORT util::Status BinaryToJsonString( TypeResolver* resolver, const string& type_url, const string& binary_input, @@ -107,7 +107,7 @@ util::Status JsonToBinaryStream( io::ZeroCopyInputStream* json_input, io::ZeroCopyOutputStream* binary_output); -util::Status JsonToBinaryString( +LIBPROTOBUF_EXPORT util::Status JsonToBinaryString( TypeResolver* resolver, const string& type_url, const string& json_input, diff --git a/src/google/protobuf/util/time_util.h b/src/google/protobuf/util/time_util.h index 1126815728..58dbf8e6e4 100644 --- a/src/google/protobuf/util/time_util.h +++ b/src/google/protobuf/util/time_util.h @@ -31,13 +31,17 @@ #ifndef GOOGLE_PROTOBUF_UTIL_TIME_UTIL_H__ #define GOOGLE_PROTOBUF_UTIL_TIME_UTIL_H__ -#include - #include #include #include +#ifdef _MSC_VER +#include +#else +#include +#endif #include +#include #include namespace google { @@ -85,6 +89,9 @@ class LIBPROTOBUF_EXPORT TimeUtil { static string ToString(const Duration& duration); static bool FromString(const string& value, Duration* timestamp); +#ifdef GetCurrentTime +#undef GetCurrentTime // Visual Studio has macro GetCurrentTime +#endif // Gets the current UTC time. static Timestamp GetCurrentTime(); // Returns the Time representing "1970-01-01 00:00:00". @@ -153,12 +160,12 @@ namespace protobuf { // Overloaded operators for Duration. // // Assignment operators. -Duration& operator+=(Duration& d1, const Duration& d2); // NOLINT -Duration& operator-=(Duration& d1, const Duration& d2); // NOLINT -Duration& operator*=(Duration& d, int64 r); // NOLINT -Duration& operator*=(Duration& d, double r); // NOLINT -Duration& operator/=(Duration& d, int64 r); // NOLINT -Duration& operator/=(Duration& d, double r); // NOLINT +LIBPROTOBUF_EXPORT Duration& operator+=(Duration& d1, const Duration& d2); // NOLINT +LIBPROTOBUF_EXPORT Duration& operator-=(Duration& d1, const Duration& d2); // NOLINT +LIBPROTOBUF_EXPORT Duration& operator*=(Duration& d, int64 r); // NOLINT +LIBPROTOBUF_EXPORT Duration& operator*=(Duration& d, double r); // NOLINT +LIBPROTOBUF_EXPORT Duration& operator/=(Duration& d, int64 r); // NOLINT +LIBPROTOBUF_EXPORT Duration& operator/=(Duration& d, double r); // NOLINT // Overload for other integer types. template Duration& operator*=(Duration& d, T r) { // NOLINT @@ -170,7 +177,7 @@ Duration& operator/=(Duration& d, T r) { // NOLINT int64 x = r; return d /= x; } -Duration& operator%=(Duration& d1, const Duration& d2); // NOLINT +LIBPROTOBUF_EXPORT Duration& operator%=(Duration& d1, const Duration& d2); // NOLINT // Relational operators. inline bool operator<(const Duration& d1, const Duration& d2) { if (d1.seconds() == d2.seconds()) { @@ -221,7 +228,7 @@ template inline Duration operator/(Duration d, T r) { return d /= r; } -int64 operator/(const Duration& d1, const Duration& d2); +LIBPROTOBUF_EXPORT int64 operator/(const Duration& d1, const Duration& d2); inline Duration operator%(const Duration& d1, const Duration& d2) { Duration result = d1; @@ -236,7 +243,9 @@ inline ostream& operator<<(ostream& out, const Duration& d) { // Overloaded operators for Timestamp // // Assignement operators. +LIBPROTOBUF_EXPORT Timestamp& operator+=(Timestamp& t, const Duration& d); // NOLINT +LIBPROTOBUF_EXPORT Timestamp& operator-=(Timestamp& t, const Duration& d); // NOLINT // Relational operators. inline bool operator<(const Timestamp& t1, const Timestamp& t2) { @@ -273,7 +282,7 @@ inline Timestamp operator-(const Timestamp& t, const Duration& d) { Timestamp result = t; return result -= d; } -Duration operator-(const Timestamp& t1, const Timestamp& t2); +LIBPROTOBUF_EXPORT Duration operator-(const Timestamp& t1, const Timestamp& t2); inline ostream& operator<<(ostream& out, const Timestamp& t) { out << google::protobuf::util::TimeUtil::ToString(t); diff --git a/src/google/protobuf/util/type_resolver_util.h b/src/google/protobuf/util/type_resolver_util.h index 00cf9c1348..c0ef3c1af9 100644 --- a/src/google/protobuf/util/type_resolver_util.h +++ b/src/google/protobuf/util/type_resolver_util.h @@ -42,7 +42,7 @@ class TypeResolver; // Creates a TypeResolver that serves type information in the given descriptor // pool. Caller takes ownership of the returned TypeResolver. -TypeResolver* NewTypeResolverForDescriptorPool( +LIBPROTOBUF_EXPORT TypeResolver* NewTypeResolverForDescriptorPool( const string& url_prefix, const DescriptorPool* pool); } // namespace util diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index fd4b49038e..b2a7e97013 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -1968,10 +1968,10 @@ bool StringValue::MergePartialFromCodedStream( if (tag == 10) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_value())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->value().data(), this->value().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.StringValue.value"); + ::google::protobuf::internal::WireFormatLite::PARSE, + "google.protobuf.StringValue.value")); } else { goto handle_unusual; } @@ -2005,9 +2005,9 @@ void StringValue::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_start:google.protobuf.StringValue) // optional string value = 1; if (this->value().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->value().data(), this->value().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.StringValue.value"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->value(), output); @@ -2021,9 +2021,9 @@ void StringValue::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.StringValue) // optional string value = 1; if (this->value().size() > 0) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->value().data(), this->value().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, + ::google::protobuf::internal::WireFormatLite::SERIALIZE, "google.protobuf.StringValue.value"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 387ebd7cb1..15bcc7a222 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -37,15 +37,15 @@ void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto(); void protobuf_AssignDesc_google_2fprotobuf_2fwrappers_2eproto(); void protobuf_ShutdownFile_google_2fprotobuf_2fwrappers_2eproto(); +class BoolValue; +class BytesValue; class DoubleValue; class FloatValue; -class Int64Value; -class UInt64Value; class Int32Value; -class UInt32Value; -class BoolValue; +class Int64Value; class StringValue; -class BytesValue; +class UInt32Value; +class UInt64Value; // =================================================================== diff --git a/update_file_lists.sh b/update_file_lists.sh index bc2911d2ae..d76a1610a3 100755 --- a/update_file_lists.sh +++ b/update_file_lists.sh @@ -27,6 +27,10 @@ get_source_files() { get_variable_value $@ | grep "cc$" } +get_proto_files_blacklisted() { + get_proto_files $@ | sed '/^google\/protobuf\/unittest_enormous_descriptor.proto$/d' +} + get_proto_files() { get_variable_value $@ | grep "pb.cc$" | sed "s/pb.cc/proto/" } @@ -53,6 +57,7 @@ LIBPROTOBUF_SOURCES=$(get_source_files $MAKEFILE libprotobuf_la_SOURCES) LIBPROTOC_SOURCES=$(get_source_files $MAKEFILE libprotoc_la_SOURCES) LITE_PROTOS=$(get_proto_files $MAKEFILE protoc_lite_outputs) PROTOS=$(get_proto_files $MAKEFILE protoc_outputs) +PROTOS_BLACKLISTED=$(get_proto_files_blacklisted $MAKEFILE protoc_outputs) WKT_PROTOS=$(get_variable_value $MAKEFILE nobase_dist_proto_DATA) COMMON_TEST_SOURCES=$(get_source_files $MAKEFILE COMMON_TEST_SOURCES) COMMON_LITE_TEST_SOURCES=$(get_source_files $MAKEFILE COMMON_LITE_TEST_SOURCES) @@ -112,7 +117,7 @@ set_cmake_value $CMAKE_DIR/libprotobuf-lite.cmake libprotobuf_lite_files $CMAKE_ set_cmake_value $CMAKE_DIR/libprotobuf.cmake libprotobuf_files $CMAKE_PREFIX $LIBPROTOBUF_SOURCES set_cmake_value $CMAKE_DIR/libprotoc.cmake libprotoc_files $CMAKE_PREFIX $LIBPROTOC_SOURCES set_cmake_value $CMAKE_DIR/tests.cmake lite_test_protos "" $LITE_PROTOS -set_cmake_value $CMAKE_DIR/tests.cmake tests_protos "" $PROTOS +set_cmake_value $CMAKE_DIR/tests.cmake tests_protos "" $PROTOS_BLACKLISTED set_cmake_value $CMAKE_DIR/tests.cmake common_test_files $CMAKE_PREFIX $COMMON_TEST_SOURCES set_cmake_value $CMAKE_DIR/tests.cmake common_lite_test_files $CMAKE_PREFIX $COMMON_LITE_TEST_SOURCES set_cmake_value $CMAKE_DIR/tests.cmake tests_files $CMAKE_PREFIX $TEST_SOURCES