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