| Index: webrtc/rtc_base/thread_checker.h
|
| diff --git a/webrtc/rtc_base/thread_checker.h b/webrtc/rtc_base/thread_checker.h
|
| index 70daf5a0fe3ab219aa79b700ea303e05f45cdf68..769b7f0565aaab177f34a0ba24f8dbbb38446b94 100644
|
| --- a/webrtc/rtc_base/thread_checker.h
|
| +++ b/webrtc/rtc_base/thread_checker.h
|
| @@ -71,22 +71,20 @@ class ThreadCheckerDoNothing {
|
| //
|
| // In Release mode, CalledOnValidThread will always return true.
|
| #if ENABLE_THREAD_CHECKER
|
| -class LOCKABLE ThreadChecker : public ThreadCheckerImpl {
|
| -};
|
| +class RTC_LOCKABLE ThreadChecker : public ThreadCheckerImpl {};
|
| #else
|
| -class LOCKABLE ThreadChecker : public ThreadCheckerDoNothing {
|
| -};
|
| +class RTC_LOCKABLE ThreadChecker : public ThreadCheckerDoNothing {};
|
| #endif // ENABLE_THREAD_CHECKER
|
|
|
| #undef ENABLE_THREAD_CHECKER
|
|
|
| namespace internal {
|
| -class SCOPED_LOCKABLE AnnounceOnThread {
|
| +class RTC_SCOPED_LOCKABLE AnnounceOnThread {
|
| public:
|
| - template<typename ThreadLikeObject>
|
| + template <typename ThreadLikeObject>
|
| explicit AnnounceOnThread(const ThreadLikeObject* thread_like_object)
|
| - EXCLUSIVE_LOCK_FUNCTION(thread_like_object) {}
|
| - ~AnnounceOnThread() UNLOCK_FUNCTION() {}
|
| + RTC_EXCLUSIVE_LOCK_FUNCTION(thread_like_object) {}
|
| + ~AnnounceOnThread() RTC_UNLOCK_FUNCTION() {}
|
|
|
| template<typename ThreadLikeObject>
|
| static bool IsCurrent(const ThreadLikeObject* thread_like_object) {
|
|
|