Fix issues discovered in up-integration.

fa11dea0 · Feng Xiao · 29325941 · fa11dea0
Commit fa11dea0 authored Aug 10, 2018 by Feng Xiao
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

message.h src/google/protobuf/message.h +1 -1

No files found.
--- 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);