diff options
| author |  jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-18 00:47:59 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-18 00:47:59 +0000 |
| commit | 4de8f55113007fdc8e34107950e605fc0209d465 (patch) | |
| tree | 92b7da8757a7740d9e1f2d3ead233542947d8c8c /src/google/protobuf/reflection_ops.cc | |
| parent | c5553a3d18f80132b9079c5504bc0aa1f7f950a0 (diff) | |
down integrate to svn
Diffstat (limited to 'src/google/protobuf/reflection_ops.cc')
| -rw-r--r-- | src/google/protobuf/reflection_ops.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/reflection_ops.cc b/src/google/protobuf/reflection_ops.cc index f00997c6..8993a24d 100644 --- a/src/google/protobuf/reflection_ops.cc +++ b/src/google/protobuf/reflection_ops.cc @@ -56,7 +56,9 @@ void ReflectionOps::Merge(const Message& from, Message* to) { const Descriptor* descriptor = from.GetDescriptor(); GOOGLE_CHECK_EQ(to->GetDescriptor(), descriptor) - << "Tried to merge messages of different types."; + << "Tried to merge messages of different types " + << "(merge " << descriptor->full_name() + << " to " << to->GetDescriptor()->full_name() << ")"; const Reflection* from_reflection = from.GetReflection(); const Reflection* to_reflection = to->GetReflection(); |