diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-09 14:22:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-09 15:11:45 +0000 |
| commit | 2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch) | |
| tree | e75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/base/logging.h | |
| parent | a4f3d46271c57e8155ba912df46a05559d14726e (diff) | |
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion.
Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/base/logging.h')
| -rw-r--r-- | chromium/base/logging.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/chromium/base/logging.h b/chromium/base/logging.h index 300c9b52694..07674698e02 100644 --- a/chromium/base/logging.h +++ b/chromium/base/logging.h @@ -373,9 +373,6 @@ const LogSeverity LOG_0 = LOG_ERROR; #define LOG_IF(severity, condition) \ LAZY_STREAM(LOG_STREAM(severity), LOG_IS_ON(severity) && (condition)) -#define SYSLOG(severity) LOG(severity) -#define SYSLOG_IF(severity, condition) LOG_IF(severity, condition) - // The VLOG macros log with negative verbosities. #define VLOG_STREAM(verbose_level) \ logging::LogMessage(__FILE__, __LINE__, -verbose_level).stream() @@ -408,8 +405,6 @@ const LogSeverity LOG_0 = LOG_ERROR; #define LOG_ASSERT(condition) \ LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition ". " -#define SYSLOG_ASSERT(condition) \ - SYSLOG_IF(FATAL, !(condition)) << "Assert failed: " #condition ". " #if defined(OS_WIN) #define PLOG_STREAM(severity) \ @@ -435,7 +430,7 @@ const LogSeverity LOG_0 = LOG_ERROR; // boolean. class CheckOpResult { public: - // |message| must be null if and only if the check failed. + // |message| must be non-null if and only if the check failed. CheckOpResult(std::string* message) : message_(message) {} // Returns true if the check succeeded. operator bool() const { return !message_; } @@ -807,12 +802,6 @@ class BASE_EXPORT LogMessage { DISALLOW_COPY_AND_ASSIGN(LogMessage); }; -// A non-macro interface to the log facility; (useful -// when the logging level is not a compile-time constant). -inline void LogAtLevel(int log_level, const std::string& msg) { - LogMessage(__FILE__, __LINE__, log_level).stream() << msg; -} - // This class is used to explicitly ignore values in the conditional // logging macros. This avoids compiler warnings like "value computed // is not used" and "statement has no effect". |