Test RTC_DCHECK_IS_ON instead of checking DCHECK_ALWAYS_ON everywhere

webrtc/base/criticalsection.h

Index: webrtc/base/criticalsection.h
diff --git a/webrtc/base/criticalsection.h b/webrtc/base/criticalsection.h
index bf77e2b78b64f99fc0f7ddf7299ad62d96baff0e..bfa67b3e50f60c4dbfaa74adfdba876adb08d6f3 100644
--- a/webrtc/base/criticalsection.h
+++ b/webrtc/base/criticalsection.h
@@ -12,6 +12,7 @@
 #define WEBRTC_BASE_CRITICALSECTION_H_
 
 #include "webrtc/base/atomicops.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/base/platform_thread_types.h"
@@ -37,11 +38,7 @@
 #include <dispatch/dispatch.h>
 #endif
 
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
-#define CS_DEBUG_CHECKS 1
-#else
-#define CS_DEBUG_CHECKS 0
-#endif
+#define CS_DEBUG_CHECKS (!!RTC_DCHECK_IS_ON)

[ossu, 2016/09/30 09:08:49]

Why!!?
uhm
I mean, why "!!"? :)
Isn't RTC_DCHECK_IS_ON 0 or 1, just like CS_DEBUG_CHECKS should be? So just
define CS_DEBUG_CHECKS to RTC_DCHECK_IS_ON or possibly even replace
CS_DEBUG_CHECKS with a check against RTC_DCHECK_IS_ON?

[kwiberg-webrtc, 2016/09/30 09:14:21]

Will do (see other comment).

[kjellander_webrtc, 2016/09/30 10:42:28]

Ah, I was going to ask what (!!RTC_DCHECK_IS_ON) means, thanks for clarifying.

[kwiberg-webrtc, 2016/09/30 11:20:41]

Yes, ! maps 0 to 1 and all other values to 0, so !! maps 0 to 0 and all other
values to 1. It's a standard C idiom; in C++, you can also do pretty much the
same thing by casting to bool.

 
 #if CS_DEBUG_CHECKS
 #define CS_DEBUG_CODE(x) x