generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clock.h: Removed GUARDED_BY annotation as it breaks som builds.

Browse Source 
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
This commit is contained in:
henrike@webrtc.org 2014-06-26 16:13:58 +00:00
parent 1d1e40f36e
commit 7ea71de396
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/system_wrappers/interface/clock.h
View File

@ -13,7 +13,6 @@
#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/thread_annotations.h"
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
@ -77,7 +76,7 @@ class SimulatedClock : public Clock {
void AdvanceTimeMicroseconds(int64_t microseconds); void AdvanceTimeMicroseconds(int64_t microseconds);
private: private:
int64_t time_us_ GUARDED_BY(lock_); int64_t time_us_;
scoped_ptr<RWLockWrapper> lock_; scoped_ptr<RWLockWrapper> lock_;
}; };