diff options
| author | Bo Yang <teboring@google.com> | 2015-05-21 14:28:59 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-05-21 19:32:02 -0700 |
| commit | 5db217305f37a79eeccd70f000088a06ec82fcec (patch) | |
| tree | be53dcf0c0b47ef9178ab8a6fa5c1946ee84a28f /src/google/protobuf/empty.pb.cc | |
| parent | 56095026ccc2f755a6fdb296e30c3ddec8f556a2 (diff) | |
| download | protobuf-5db217305f37a79eeccd70f000088a06ec82fcec.tar.gz protobuf-5db217305f37a79eeccd70f000088a06ec82fcec.tar.bz2 protobuf-5db217305f37a79eeccd70f000088a06ec82fcec.zip | |
down-integrate internal changes
Diffstat (limited to 'src/google/protobuf/empty.pb.cc')
| -rw-r--r-- | src/google/protobuf/empty.pb.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc index f7ca5013..1a9a6661 100644 --- a/src/google/protobuf/empty.pb.cc +++ b/src/google/protobuf/empty.pb.cc @@ -111,7 +111,7 @@ static void MergeFromFail(int line) { #endif // !_MSC_VER Empty::Empty() - : ::google::protobuf::Message() , _internal_metadata_(NULL) { + : ::google::protobuf::Message(), _internal_metadata_(NULL) { SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.Empty) } @@ -221,9 +221,9 @@ int Empty::ByteSize() const { void Empty::MergeFrom(const ::google::protobuf::Message& from) { if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const Empty* source = - ::google::protobuf::internal::dynamic_cast_if_available<const Empty*>( - &from); + const Empty* source = + ::google::protobuf::internal::DynamicCastToGenerated<const Empty>( + &from); if (source == NULL) { ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { |