From 2019afd0ef27c203bf2b32ba00fd66e1f6e1c06c Mon Sep 17 00:00:00 2001 From: danilchap Date: Wed, 8 Jun 2016 11:34:11 -0700 Subject: [PATCH] Replaced ACCESS_ON alias with GUARDED_BY macros to fix projects that has own copy of base/thread_annotation.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit R=åsapersson NOTRY=true Review-Url: https://codereview.webrtc.org/2048113002 Cr-Commit-Position: refs/heads/master@{#13073} --- webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h index 5261415fba..8ee135e1b8 100644 --- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h +++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h @@ -79,11 +79,11 @@ class PlayoutDelayOracle { // Data in this section is accessed on the sending/encoder thread alone. rtc::ThreadChecker thread_checker_; // Sequence number unwrapper. - SequenceNumberUnwrapper unwrapper_ ACCESS_ON(thread_checker_); + SequenceNumberUnwrapper unwrapper_ GUARDED_BY(thread_checker_); // Min playout delay value on the next frame if |send_playout_delay_| is set. - int min_playout_delay_ms_ ACCESS_ON(thread_checker_); + int min_playout_delay_ms_ GUARDED_BY(thread_checker_); // Max playout delay value on the next frame if |send_playout_delay_| is set. - int max_playout_delay_ms_ ACCESS_ON(thread_checker_); + int max_playout_delay_ms_ GUARDED_BY(thread_checker_); RTC_DISALLOW_COPY_AND_ASSIGN(PlayoutDelayOracle); };