Merge pull request #5033 from xfxyjwf/up

Fix issues discovered in up-integration.
6 years ago · d39c7ef6eb
parent f2a326d36e fa11dea05b
commit d39c7ef6eb
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/message.h
+++ b/src/google/protobuf/message.h
@ -1160,7 +1160,7 @@ const T* DynamicCastToGenerated(const Message* from) {
  (void)unused;

 #ifdef GOOGLE_PROTOBUF_NO_RTTI
-  bool ok = &T::default_instance()->GetReflection() == from->GetReflection();
+  bool ok = T::default_instance().GetReflection() == from->GetReflection();
  return ok ? down_cast<const T*>(from) : nullptr;
 #else
  return dynamic_cast<const T*>(from);