bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use DCHECK_IS_ON() instead of !NDEBUG for debug logic (issue #1961)

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-09-01 14:24:30 +03:00
parent ad1619dbd7
commit 5068b50b48
278 changed files with 320 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/base/cef_lock.h
View File

@ -45,6 +45,7 @@
// If the Chromium implementation diverges the below implementation should be
// updated to match.
#include "include/base/cef_logging.h"
#include "include/base/cef_macros.h"
#include "include/base/cef_platform_thread.h"
#include "include/base/internal/cef_lock_impl.h"
@ -57,7 +58,7 @@ namespace cef_internal {
// AssertAcquired() method.
class Lock {
public:
#if defined(NDEBUG) // Optimized wrapper implementation
#if !DCHECK_IS_ON() // Optimized wrapper implementation
Lock() : lock_() {}
~Lock() {}
void Acquire() { lock_.Lock(); }
@ -96,10 +97,10 @@ class Lock {
}
void AssertAcquired() const;
#endif // NDEBUG
#endif // !DCHECK_IS_ON()
private:
#if !defined(NDEBUG)
#if DCHECK_IS_ON()
// Members and routines taking care of locks assertions.
// Note that this checks for recursive locks and allows them
// if the variable is set. This is allowed by the underlying implementation
@ -111,7 +112,7 @@ class Lock {
// All private data is implicitly protected by lock_.
// Be VERY careful to only access members under that lock.
base::PlatformThreadRef owning_thread_ref_;
#endif // NDEBUG
#endif // DCHECK_IS_ON()
// Platform specific underlying lock implementation.
LockImpl lock_;