commit 7ea71de39659301ce75e35bebef6d9945cdb15ed
author henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jun 26 16:13:58 2014 +0000
committer henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jun 26 16:13:58 2014 +0000
tree e015e9705896cc781d84242bcf60528175b2a950
parent 1d1e40f36e954e7ad0657251baab8f93aff80dc0

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

diff --git a/webrtc/system_wrappers/interface/clock.h b/webrtc/system_wrappers/interface/clock.h
index 2bb6c10..ed65006 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 @@
   void AdvanceTimeMicroseconds(int64_t microseconds);
 
  private:
-  int64_t time_us_ GUARDED_BY(lock_);
+  int64_t time_us_;
   scoped_ptr<RWLockWrapper> lock_;
 };