Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorAlexander Zatsepin <az@mapswithme.com>2018-04-16 20:18:36 +0300
committerAleksandr Zatsepin <alexzatsepin@users.noreply.github.com>2018-04-25 15:38:50 +0300
commitf3ddef8be0a7d99c7a290d32af583188ab86ba4b (patch)
treeaa116c4e9554b16c5a292a9865b82bbf2dca833f /base
parent4d60e53308ee868f02eb16d454f6d79a79593bda (diff)
[core] Tightened the thread checker
Diffstat (limited to 'base')
-rw-r--r--base/thread_checker.hpp20
1 files changed, 7 insertions, 13 deletions
diff --git a/base/thread_checker.hpp b/base/thread_checker.hpp
index c4592016ad..a239851281 100644
--- a/base/thread_checker.hpp
+++ b/base/thread_checker.hpp
@@ -23,16 +23,10 @@ private:
DISALLOW_COPY_AND_MOVE(ThreadChecker);
};
-#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
+#define DECLARE_THREAD_CHECKER(threadCheckerName) ThreadChecker threadCheckerName
+#define CHECK_THREAD_CHECKER(threadCheckerName, msg) CHECK(threadCheckerName.CalledOnOriginalThread(), msg)
+#define DECLARE_AND_CHECK_THREAD_CHECKER(msg) \
+{ \
+ static const ThreadChecker threadChecker; \
+ CHECK(threadChecker.CalledOnOriginalThread(), (msg)); \
+}