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/logging.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/logging.h')
-rw-r--r-- | src/google/protobuf/stubs/logging.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/stubs/logging.h b/src/google/protobuf/stubs/logging.h index f69605d9..f7c6d6a8 100644 --- a/src/google/protobuf/stubs/logging.h +++ b/src/google/protobuf/stubs/logging.h @@ -162,7 +162,7 @@ namespace internal { template<typename T> T* CheckNotNull(const char* /* file */, int /* line */, const char* name, T* val) { - if (val == NULL) { + if (val == nullptr) { GOOGLE_LOG(FATAL) << name; } return val; @@ -170,7 +170,7 @@ T* CheckNotNull(const char* /* file */, int /* line */, } // namespace internal #define GOOGLE_CHECK_NOTNULL(A) \ ::google::protobuf::internal::CheckNotNull(\ - __FILE__, __LINE__, "'" #A "' must not be NULL", (A)) + __FILE__, __LINE__, "'" #A "' must not be nullptr", (A)) #ifdef NDEBUG @@ -208,7 +208,7 @@ typedef void LogHandler(LogLevel level, const char* filename, int line, // also help end users figure out a problem. If you would prefer that // these messages be sent somewhere other than stderr, call SetLogHandler() // to set your own handler. This returns the old handler. Set the handler -// to NULL to ignore log messages (but see also LogSilencer, below). +// to nullptr to ignore log messages (but see also LogSilencer, below). // // Obviously, SetLogHandler is not thread-safe. You should only call it // at initialization time, and probably not from library code. If you |