diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
| commit | a8465b738e5a1f346ece58ea6f82612bcd6659d2 (patch) | |
| tree | b755540a5d7d2cc988eabc7ac594e6abd9da29d1 /src/google/protobuf/stubs/casts.h | |
| parent | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (diff) | |
| parent | 9bbc4b1fab8262958c172f2d8e87b486c950a051 (diff) | |
| download | protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.gz protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.bz2 protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.zip | |
Merge master branch.
Diffstat (limited to 'src/google/protobuf/stubs/casts.h')
| -rw-r--r-- | src/google/protobuf/stubs/casts.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/casts.h b/src/google/protobuf/stubs/casts.h index 35e2dba0..b509f68c 100644 --- a/src/google/protobuf/stubs/casts.h +++ b/src/google/protobuf/stubs/casts.h @@ -89,7 +89,7 @@ inline To down_cast(From* f) { // so we only accept pointers } #if !defined(NDEBUG) && !defined(GOOGLE_PROTOBUF_NO_RTTI) - assert(f == NULL || dynamic_cast<To>(f) != NULL); // RTTI: debug mode only! + assert(f == nullptr || dynamic_cast<To>(f) != nullptr); // RTTI: debug mode only! #endif return static_cast<To>(f); } @@ -107,7 +107,7 @@ inline To down_cast(From& f) { #if !defined(NDEBUG) && !defined(GOOGLE_PROTOBUF_NO_RTTI) // RTTI: debug mode only! - assert(dynamic_cast<ToAsPointer>(&f) != NULL); + assert(dynamic_cast<ToAsPointer>(&f) != nullptr); #endif return *static_cast<ToAsPointer>(&f); } |