From 7ea71de39659301ce75e35bebef6d9945cdb15ed Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Thu, 26 Jun 2014 16:13:58 +0000 Subject: [PATCH] clock.h: Removed GUARDED_BY annotation as it breaks som builds. BUG=N/A TBR=henrik.lundin@webrtc.org Review URL: https://webrtc-codereview.appspot.com/14769004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6547 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/system_wrappers/interface/clock.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webrtc/system_wrappers/interface/clock.h b/webrtc/system_wrappers/interface/clock.h index 2bb6c108f3..ed65006c05 100644 --- a/webrtc/system_wrappers/interface/clock.h +++ b/webrtc/system_wrappers/interface/clock.h @@ -13,7 +13,6 @@ #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { @@ -77,7 +76,7 @@ class SimulatedClock : public Clock { void AdvanceTimeMicroseconds(int64_t microseconds); private: - int64_t time_us_ GUARDED_BY(lock_); + int64_t time_us_; scoped_ptr lock_; };