From 0faa81ef5716d6611f4f199e4c222638c75d614b Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 9 Mar 2016 13:01:52 +0300 Subject: [PATCH] Convenient macro for thread checker to use it once in-place. --- base/thread_checker.hpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/thread_checker.hpp b/base/thread_checker.hpp index ebf5f96c3b..b303ba0781 100644 --- a/base/thread_checker.hpp +++ b/base/thread_checker.hpp @@ -26,7 +26,12 @@ private: #if defined(DEBUG) #define DECLARE_THREAD_CHECKER(threadCheckerName) ThreadChecker threadCheckerName #define ASSERT_THREAD_CHECKER(threadCheckerName, msg) ASSERT(threadCheckerName.CalledOnOriginalThread(), msg) + #define DECLARE_AND_ASSERT_THREAD_CHECKER(msg) { \ + static const ThreadChecker threadChecker; \ + ASSERT(threadChecker.CalledOnOriginalThread(), (msg)); \ + } #else #define DECLARE_THREAD_CHECKER(threadCheckerName) #define ASSERT_THREAD_CHECKER(threadCheckerName, msg) + #define DECLARE_AND_ASSERT_THREAD_CHECKER(msg) #endif