commit a41ab9326c8f0f7eb738e5d51a239a2b9e276361
author tfarina <tfarina@chromium.org> Fri Oct 30 16:08:48 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 30 23:08:54 2015 +0000
tree 3366e216ef79b25b8b9ea91709757d1fd657cf77
parent 5c3da4b6e9bdc787a3c1f25c0ff0c16a4271fd26

Switch usage of _DEBUG macro to NDEBUG.

http://stackoverflow.com/a/29253284/5237416

BUG=None
R=tommi@webrtc.org
NOPRESUBMIT=true

Review URL: https://codereview.webrtc.org/1429513004

Cr-Commit-Position: refs/heads/master@{#10468}

webrtc/base/logging.cc

diff --git a/webrtc/base/logging.cc b/webrtc/base/logging.cc
index b02be27..686b9b2 100644
--- a/webrtc/base/logging.cc
+++ b/webrtc/base/logging.cc
@@ -92,13 +92,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // By default, release builds don't log, debug builds at info level
-#if _DEBUG
+#if !defined(NDEBUG)
 LoggingSeverity LogMessage::min_sev_ = LS_INFO;
 LoggingSeverity LogMessage::dbg_sev_ = LS_INFO;
-#else  // !_DEBUG
+#else
 LoggingSeverity LogMessage::min_sev_ = LS_NONE;
 LoggingSeverity LogMessage::dbg_sev_ = LS_NONE;
-#endif  // !_DEBUG
+#endif
 bool LogMessage::log_to_stderr_ = true;
 
 namespace {
@@ -340,7 +340,7 @@
                                LoggingSeverity severity,
                                const std::string& tag) {
   bool log_to_stderr = log_to_stderr_;
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && (!defined(_DEBUG) || defined(NDEBUG))
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && defined(NDEBUG)
   // On the Mac, all stderr output goes to the Console log and causes clutter.
   // So in opt builds, don't log to stderr unless the user specifically sets
   // a preference to do so.