aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/timestamp.pb.cc
diff options
context:
space:
mode:
authorGravatar Thomas Van Lenten <thomasvl@google.com>2015-05-18 12:48:21 -0400
committerGravatar Thomas Van Lenten <thomasvl@google.com>2015-05-18 12:57:33 -0400
commitffa2e377f3fc884f2c59ac0b942ad55b4037f76b (patch)
tree562ffef8eb638988b3a75060359ab5d1729a3a10 /src/google/protobuf/timestamp.pb.cc
parent17ca0fee20029c571e1002938ef9bc2b5cf53266 (diff)
Post csharp landing fixup.
Re-add the objc prefix that got removed by accident. Regenerate the generated descriptors (C++ and ObjC).
Diffstat (limited to 'src/google/protobuf/timestamp.pb.cc')
-rw-r--r--src/google/protobuf/timestamp.pb.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc
index 0df53f63..6edfe056 100644
--- a/src/google/protobuf/timestamp.pb.cc
+++ b/src/google/protobuf/timestamp.pb.cc
@@ -82,8 +82,9 @@ void protobuf_AddDesc_google_2fprotobuf_2ftimestamp_2eproto() {
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\037google/protobuf/timestamp.proto\022\017googl"
"e.protobuf\"+\n\tTimestamp\022\017\n\007seconds\030\001 \001(\003"
- "\022\r\n\005nanos\030\002 \001(\005B0\n\023com.google.protobufB\016"
- "TimestampProtoP\001\240\001\001\242\002\003GPBb\006proto3", 153);
+ "\022\r\n\005nanos\030\002 \001(\005BI\n\023com.google.protobufB\016"
+ "TimestampProtoP\001\240\001\001\242\002\003GPB\252\002\026Google.Proto"
+ "colBuffersb\006proto3", 178);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"google/protobuf/timestamp.proto", &protobuf_RegisterTypes);
Timestamp::default_instance_ = new Timestamp();