commit 9b9688bbdc9acca349c0e0466b643323e22888dc
author piman <piman@chromium.org> Wed May 06 05:25:56 2015 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 18:52:21 2020 +0900
tree a64f017574fe6d46cbdbb32b008f667d853ebb9a
parent b05d0958b24b61d8f2a8efa4a6d5f03ce4ed2432

Revert of Remove unnecessary ternaries to improve readability. (patchset #1 id:1 of https://codereview.chromium.org/1128513002/)

Reason for revert:
Compile errors - http://build.chromium.org/p/chromium/buildstatus?builder=Win&number=31603

Original issue's description:
> Remove unnecessary ternaries to improve readability.
>
> BUG=None
>
> Committed: https://crrev.com/d358dccf326b51d60b72292bae9f73cdd1475bcf
> Cr-Commit-Position: refs/heads/master@{#328388}

TBR=danakj@chromium.org,tnagel@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None

Review URL: https://codereview.chromium.org/1127593004

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


CrOS-Libchrome-Original-Commit: 2ac89dd3c312af5fb7950803594986b50dcc5c91

base/logging.h

diff --git a/base/logging.h b/base/logging.h
index 376ebb6..cc0a5aa 100644
--- a/base/logging.h
+++ b/base/logging.h
@@ -653,12 +653,12 @@
 
 #else  // _PREFAST_
 
-#define DCHECK(condition)                                         \
-  LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition)) \
+#define DCHECK(condition)                                                \
+  LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON() ? !(condition) : false) \
       << "Check failed: " #condition ". "
 
-#define DPCHECK(condition)                                         \
-  LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON() && !(condition)) \
+#define DPCHECK(condition)                                                \
+  LAZY_STREAM(PLOG_STREAM(DCHECK), DCHECK_IS_ON() ? !(condition) : false) \
       << "Check failed: " #condition ". "
 
 #endif  // _PREFAST_