diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-26 16:13:58 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-26 16:13:58 +0000 |
| commit | 1e90eed2ba3dd67f1932150db4cb02f7dfb4bd90 (patch) | |
| tree | 6f6517c12c82fdf634c72488ccbc5c284b8b05ff /system_wrappers | |
| parent | a622b06b46ce8584f534a876f5f052e4074f5637 (diff) | |
| download | webrtc-1e90eed2ba3dd67f1932150db4cb02f7dfb4bd90.tar.gz | |
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/webrtc@6547 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'system_wrappers')
| -rw-r--r-- | system_wrappers/interface/clock.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/system_wrappers/interface/clock.h b/system_wrappers/interface/clock.h index 2bb6c108..ed65006c 100644 --- a/system_wrappers/interface/clock.h +++ b/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<RWLockWrapper> lock_; }; |