diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:18:45 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:18:45 -0700 |
commit | b0f661181d10bddc08e380992590a1cdd92be92b (patch) | |
tree | d9291cf324a72206ae3e474fe49186e8c96b2a9e /src/google/protobuf/empty.pb.cc | |
parent | d119a275495b7dcc9c389c9c650ebd83de265511 (diff) | |
download | protobuf-b0f661181d10bddc08e380992590a1cdd92be92b.tar.gz protobuf-b0f661181d10bddc08e380992590a1cdd92be92b.tar.bz2 protobuf-b0f661181d10bddc08e380992590a1cdd92be92b.zip |
Down-integrate from internal branch.
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
Diffstat (limited to 'src/google/protobuf/empty.pb.cc')
-rw-r--r-- | src/google/protobuf/empty.pb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc index 1a9a6661..319279c9 100644 --- a/src/google/protobuf/empty.pb.cc +++ b/src/google/protobuf/empty.pb.cc @@ -79,8 +79,8 @@ void protobuf_AddDesc_google_2fprotobuf_2fempty_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\033google/protobuf/empty.proto\022\017google.pr" - "otobuf\"\007\n\005EmptyB)\n\023com.google.protobufB\n" - "EmptyProtoP\001\242\002\003GPBb\006proto3", 106); + "otobuf\"\007\n\005EmptyB,\n\023com.google.protobufB\n" + "EmptyProtoP\001\240\001\001\242\002\003GPBb\006proto3", 109); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/empty.proto", &protobuf_RegisterTypes); Empty::default_instance_ = new Empty(); |