Index: webrtc/rtc_base/sequenced_task_checker.h |
diff --git a/webrtc/rtc_base/sequenced_task_checker.h b/webrtc/rtc_base/sequenced_task_checker.h |
index 40b07f98e6c66ee9bed4363557d4e659a78022a3..59c49769251fa3f3a341e246ff2ef4fede692312 100644 |
--- a/webrtc/rtc_base/sequenced_task_checker.h |
+++ b/webrtc/rtc_base/sequenced_task_checker.h |
@@ -14,7 +14,7 @@ |
// Apart from debug builds, we also enable the sequence checker in |
// builds with RTC_DCHECK_IS_ON so that trybots and waterfall bots |
// with this define will get the same level of checking as debug bots. |
-#define ENABLE_SEQUENCED_TASK_CHECKER RTC_DCHECK_IS_ON |
+#define RTC_ENABLE_SEQUENCED_TASK_CHECKER RTC_DCHECK_IS_ON |
#include "webrtc/rtc_base/checks.h" |
#include "webrtc/rtc_base/constructormagic.h" |
@@ -53,18 +53,19 @@ class SequencedTaskCheckerDoNothing { |
// } |
// |
// In Release mode, CalledOnValidThread will always return true. |
-#if ENABLE_SEQUENCED_TASK_CHECKER |
-class LOCKABLE SequencedTaskChecker : public SequencedTaskCheckerImpl {}; |
+#if RTC_ENABLE_SEQUENCED_TASK_CHECKER |
+class RTC_LOCKABLE SequencedTaskChecker : public SequencedTaskCheckerImpl {}; |
#else |
-class LOCKABLE SequencedTaskChecker : public SequencedTaskCheckerDoNothing {}; |
-#endif // ENABLE_SEQUENCED_TASK_CHECKER_H_ |
+class RTC_LOCKABLE SequencedTaskChecker : public SequencedTaskCheckerDoNothing { |
+}; |
+#endif // RTC_ENABLE_SEQUENCED_TASK_CHECKER_H_ |
namespace internal { |
-class SCOPED_LOCKABLE SequencedTaskCheckerScope { |
+class RTC_SCOPED_LOCKABLE SequencedTaskCheckerScope { |
public: |
explicit SequencedTaskCheckerScope(const SequencedTaskChecker* checker) |
- EXCLUSIVE_LOCK_FUNCTION(checker); |
- ~SequencedTaskCheckerScope() UNLOCK_FUNCTION(); |
+ RTC_EXCLUSIVE_LOCK_FUNCTION(checker); |
+ ~SequencedTaskCheckerScope() RTC_UNLOCK_FUNCTION(); |
}; |
} // namespace internal |
@@ -72,7 +73,7 @@ class SCOPED_LOCKABLE SequencedTaskCheckerScope { |
#define RTC_DCHECK_CALLED_SEQUENTIALLY(x) \ |
rtc::internal::SequencedTaskCheckerScope checker(x) |
-#undef ENABLE_SEQUENCED_TASK_CHECKER |
+#undef RTC_ENABLE_SEQUENCED_TASK_CHECKER |
} // namespace rtc |
#endif // WEBRTC_RTC_BASE_SEQUENCED_TASK_CHECKER_H_ |