diff options
| author |  Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
| commit | 0400cca3236de1ca303af38bf81eab332d042b7c (patch) | |
| tree | a8a9b19853f64567c96750a1c7d253926471daa5 /src/google/protobuf/reflection_ops.cc | |
| parent | 96b535cc2f4f7b7e22a1b8622149f7c26a5a3f63 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/reflection_ops.cc')
| -rw-r--r-- | src/google/protobuf/reflection_ops.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/reflection_ops.cc b/src/google/protobuf/reflection_ops.cc index eb2a0e7a..3cd50340 100644 --- a/src/google/protobuf/reflection_ops.cc +++ b/src/google/protobuf/reflection_ops.cc @@ -50,10 +50,10 @@ namespace internal { static const Reflection* GetReflectionOrDie(const Message& m) { const Reflection* r = m.GetReflection(); - if (r == NULL) { + if (r == nullptr) { const Descriptor* d = m.GetDescriptor(); const string& mtype = d ? d->name() : "unknown"; - // RawMessage is one known type for which GetReflection() returns NULL. + // RawMessage is one known type for which GetReflection() returns nullptr. GOOGLE_LOG(FATAL) << "Message does not support reflection (type " << mtype << ")."; } return r; |