diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-08-07 12:05:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 12:05:29 -0700 |
| commit | f504d95d461319ad9fc11e0925569b84a4c65d7d (patch) | |
| tree | 0d30b048b4176ec9aa7d3b14a60925cb74c6cc2b /src/google/protobuf/stubs/casts.h | |
| parent | 3389bd965b1fb6687056d81b069e99f8c2543cba (diff) | |
| parent | 526b350199e604b62daaee9febc5d8a8d593a010 (diff) | |
| download | protobuf-f504d95d461319ad9fc11e0925569b84a4c65d7d.tar.gz protobuf-f504d95d461319ad9fc11e0925569b84a4c65d7d.tar.bz2 protobuf-f504d95d461319ad9fc11e0925569b84a4c65d7d.zip | |
Merge pull request #5010 from batradhruv/4593
#4593 Replace all occurrences of "NULL" to nullptr in src/google/proto…
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); } |