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/wrappers.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/wrappers.pb.cc')
-rw-r--r-- | src/google/protobuf/wrappers.pb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index ffc77f1c..db75db15 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -262,9 +262,9 @@ void protobuf_AddDesc_google_2fprotobuf_2fwrappers_2eproto() { "e\030\001 \001(\004\"\033\n\nInt32Value\022\r\n\005value\030\001 \001(\005\"\034\n\013" "UInt32Value\022\r\n\005value\030\001 \001(\r\"\032\n\tBoolValue\022" "\r\n\005value\030\001 \001(\010\"\034\n\013StringValue\022\r\n\005value\030\001" - " \001(\t\"\033\n\nBytesValue\022\r\n\005value\030\001 \001(\014BE\n\023com" + " \001(\t\"\033\n\nBytesValue\022\r\n\005value\030\001 \001(\014BM\n\023com" ".google.protobufB\rWrappersProtoP\001\242\002\003GPB\252" - "\002\026Google.ProtocolBuffersb\006proto3", 392); + "\002\036Google.Protobuf.WellKnownTypesb\006proto3", 400); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/wrappers.proto", &protobuf_RegisterTypes); DoubleValue::default_instance_ = new DoubleValue(); |