diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-12 14:07:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 10:29:26 +0000 |
| commit | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (patch) | |
| tree | 25cde714b2b71eb639d1cd53f5a22e9ba76e14ef /chromium/base/logging.h | |
| parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
BASELINE: Update Chromium to 59.0.3071.134
Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/logging.h')
| -rw-r--r-- | chromium/base/logging.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chromium/base/logging.h b/chromium/base/logging.h index c67b937e5b0..1dcb0f71f12 100644 --- a/chromium/base/logging.h +++ b/chromium/base/logging.h @@ -642,7 +642,7 @@ inline typename std::enable_if< std::is_enum<T>::value, void>::type MakeCheckOpValueString(std::ostream* os, const T& v) { - (*os) << static_cast<typename base::underlying_type<T>::type>(v); + (*os) << static_cast<typename std::underlying_type<T>::type>(v); } // We need an explicit overload for std::nullptr_t. @@ -747,13 +747,6 @@ DEFINE_CHECK_OP_IMPL(GT, > ) #endif // DCHECK_IS_ON() -// DEBUG_MODE is for runtime uses like -// if (DEBUG_MODE) foo.CheckThatFoo(); -// We tie its state to DCHECK_IS_ON(). -// -// For compile-time checks, #if DCHECK_IS_ON() can be used. -enum { DEBUG_MODE = DCHECK_IS_ON() }; - #define DLOG(severity) \ LAZY_STREAM(LOG_STREAM(severity), DLOG_IS_ON(severity)) |