diff options
| author | Xiao Hang <rocking@google.com> | 2015-08-04 15:07:44 -0700 |
|---|---|---|
| committer | Xiao Hang <rocking@google.com> | 2015-08-04 15:07:44 -0700 |
| commit | 9fd0f1526fab9ee9b7e9d021185bc3507048a6d2 (patch) | |
| tree | a10acdb4210cf4d7dc770db88efc694aa35ec1de /src/google/protobuf/any.pb.cc | |
| parent | f5a3abc20487e423a7b3b2e13ad630e2d5026895 (diff) | |
| parent | dc80689af3951d078cb556588eece89dd6860c91 (diff) | |
| download | protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.tar.gz protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.tar.bz2 protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/google/protobuf/any.pb.cc')
| -rw-r--r-- | src/google/protobuf/any.pb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 2c492b04..c2e58131 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -82,9 +82,9 @@ void protobuf_AddDesc_google_2fprotobuf_2fany_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\031google/protobuf/any.proto\022\017google.prot" "obuf\"&\n\003Any\022\020\n\010type_url\030\001 \001(\t\022\r\n\005value\030\002" - " \001(\014BC\n\023com.google.protobufB\010AnyProtoP\001\240" - "\001\001\242\002\003GPB\252\002\026Google.ProtocolBuffersb\006proto" - "3", 161); + " \001(\014BK\n\023com.google.protobufB\010AnyProtoP\001\240" + "\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownType" + "sb\006proto3", 169); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/any.proto", &protobuf_RegisterTypes); Any::default_instance_ = new Any(); |