From ebed24dbfb0002c3f8a2574845c0521db1bc947c Mon Sep 17 00:00:00 2001 From: Alex Glaznev Date: Tue, 15 Sep 2015 11:05:24 -0700 Subject: [PATCH] Do not print C++ line numbers for Java logging. R=jiayl@webrtc.org Review URL: https://codereview.webrtc.org/1342963002 . Cr-Commit-Position: refs/heads/master@{#9945} --- webrtc/base/logging.cc | 3 ++- webrtc/base/logging.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/webrtc/base/logging.cc b/webrtc/base/logging.cc index 0bc3866b7b..affbb03bd4 100644 --- a/webrtc/base/logging.cc +++ b/webrtc/base/logging.cc @@ -132,7 +132,8 @@ LogMessage::LogMessage(const char* file, int line, LoggingSeverity sev, print_stream_ << "[" << std::dec << id << "] "; } - print_stream_ << "(" << FilenameFromPath(file) << ":" << line << "): "; + if (file != NULL) + print_stream_ << "(" << FilenameFromPath(file) << ":" << line << "): "; if (err_ctx != ERRCTX_NONE) { std::ostringstream tmp; diff --git a/webrtc/base/logging.h b/webrtc/base/logging.h index 67a350b751..739bf63128 100644 --- a/webrtc/base/logging.h +++ b/webrtc/base/logging.h @@ -354,7 +354,7 @@ inline bool LogCheckLevel(LoggingSeverity sev) { #define LOG_TAG(sev, tag) \ LOG_SEVERITY_PRECONDITION(sev) \ - rtc::LogMessage(__FILE__, __LINE__, sev, tag).stream() + rtc::LogMessage(NULL, 0, sev, tag).stream() #define PLOG(sev, err) \ LOG_ERR_EX(sev, err)