diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-07-25 11:52:33 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-25 11:52:33 -0700 |
| commit | 759245a49a00315a41b28da8fe52a2894d4f57ea (patch) | |
| tree | 5a0032a1a3619a448d5301da131907ca8449730f /src/google/protobuf/any.pb.cc | |
| parent | 4bff88e0fb2338657a781eeee0c5362a57b57bf3 (diff) | |
Merge from master
Diffstat (limited to 'src/google/protobuf/any.pb.cc')
| -rw-r--r-- | src/google/protobuf/any.pb.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 7ac946e0..e9419d07 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -95,6 +95,7 @@ void InitDefaults() { static GOOGLE_PROTOBUF_DECLARE_ONCE(once); ::google::protobuf::GoogleOnceInit(&once, &TableStruct::InitDefaultsImpl); } +namespace { void AddDescriptorsImpl() { InitDefaults(); static const char descriptor[] GOOGLE_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { @@ -110,6 +111,7 @@ void AddDescriptorsImpl() { ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/any.proto", &protobuf_RegisterTypes); } +} // anonymous namespace void AddDescriptors() { static GOOGLE_PROTOBUF_DECLARE_ONCE(once); @@ -309,6 +311,7 @@ void Any::SerializeWithCachedSizes( ::google::protobuf::uint8* Any::InternalSerializeWithCachedSizesToArray( bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Any) ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; |