Replace NULL with nullptr or null in webrtc/base/.
BUG=webrtc:7147
Review-Url: https://codereview.webrtc.org/2718663005
Cr-Commit-Position: refs/heads/master@{#16878}
diff --git a/webrtc/base/logging.h b/webrtc/base/logging.h
index 13f0b78..8f476a0 100644
--- a/webrtc/base/logging.h
+++ b/webrtc/base/logging.h
@@ -139,9 +139,12 @@
class LogMessage {
public:
- LogMessage(const char* file, int line, LoggingSeverity sev,
- LogErrorContext err_ctx = ERRCTX_NONE, int err = 0,
- const char* module = NULL);
+ LogMessage(const char* file,
+ int line,
+ LoggingSeverity sev,
+ LogErrorContext err_ctx = ERRCTX_NONE,
+ int err = 0,
+ const char* module = nullptr);
LogMessage(const char* file,
int line,
@@ -185,7 +188,7 @@
// GetLogToStream gets the severity for the specified stream, of if none
// is specified, the minimum stream severity.
// RemoveLogToStream removes the specified stream, without destroying it.
- static int GetLogToStream(LogSink* stream = NULL);
+ static int GetLogToStream(LogSink* stream = nullptr);
static void AddLogToStream(LogSink* stream, LoggingSeverity min_sev);
static void RemoveLogToStream(LogSink* stream);
@@ -254,7 +257,7 @@
};
// When possible, pass optional state variable to track various data across
-// multiple calls to LogMultiline. Otherwise, pass NULL.
+// multiple calls to LogMultiline. Otherwise, pass null.
void LogMultiline(LoggingSeverity level, const char* label, bool input,
const void* data, size_t len, bool hex_mode,
LogMultilineState* state);
@@ -351,9 +354,9 @@
(errno)
#endif // WEBRTC_WIN
-#define LOG_TAG(sev, tag) \
+#define LOG_TAG(sev, tag) \
LOG_SEVERITY_PRECONDITION(sev) \
- rtc::LogMessage(NULL, 0, sev, tag).stream()
+ rtc::LogMessage(nullptr, 0, sev, tag).stream()
#define PLOG(sev, err) \
LOG_ERR_EX(sev, err)