aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-08-10 16:36:49 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2018-08-13 15:20:04 -0700
commitfa11dea05bd6d5c9d0e4650cb878690ccb1cbe62 (patch)
tree0618b2d4e5d8ef93f828e8ecea480a1e715cbe2a /src
parent29325941450e529cbca55f84b0f3906f680a28fe (diff)
downloadprotobuf-fa11dea05bd6d5c9d0e4650cb878690ccb1cbe62.tar.gz
protobuf-fa11dea05bd6d5c9d0e4650cb878690ccb1cbe62.tar.bz2
protobuf-fa11dea05bd6d5c9d0e4650cb878690ccb1cbe62.zip
Fix issues discovered in up-integration.
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/message.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h
index 023660c0..007dafa2 100644
--- 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);