diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-13 15:20:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 15:20:48 -0700 |
| commit | d39c7ef6ebda148ef52fcb9dc276339120aa3036 (patch) | |
| tree | df36dc19f9a0a9404c94216f668e94e6f36dd9bf /src | |
| parent | f2a326d36e1fd3f9c5967f5f89648df5b754a382 (diff) | |
| parent | fa11dea05bd6d5c9d0e4650cb878690ccb1cbe62 (diff) | |
| download | protobuf-d39c7ef6ebda148ef52fcb9dc276339120aa3036.tar.gz protobuf-d39c7ef6ebda148ef52fcb9dc276339120aa3036.tar.bz2 protobuf-d39c7ef6ebda148ef52fcb9dc276339120aa3036.zip | |
Merge pull request #5033 from xfxyjwf/up
Fix issues discovered in up-integration.
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/message.h | 2 |
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); |