From e9509ea576f4fb1b65598435f0e13d1dcd127f7a Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Wed, 3 Sep 2014 14:45:48 +0200
Subject: [PATCH] <chromium> Removed GUARDED_BY annotation from clock.h in
webrtc.
This patch has been cherry-picked from upstream chromium,
as the GUARDED_BY annotation broke Qt builds on OSX with
older Xcode / clang versions.
Review URL: https://webrtc-codereview.appspot.com/14769004
Change-Id: Ib77d997f0c628e3bb378a06c427fbe938cd7dbc0
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
chromium/third_party/webrtc/system_wrappers/interface/clock.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/chromium/third_party/webrtc/system_wrappers/interface/clock.h b/chromium/third_party/webrtc/system_wrappers/interface/clock.h
index c03f976d40b..c9f8c5051c0 100644
--- a/chromium/third_party/webrtc/system_wrappers/interface/clock.h
+++ b/chromium/third_party/webrtc/system_wrappers/interface/clock.h
@@ -12,7 +12,6 @@
#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CLOCK_H_
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
-#include "webrtc/system_wrappers/interface/thread_annotations.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@@ -78,7 +77,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_;
};
--
GitLab