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

Revert "Workaround Mac align bug for observer_ and crit_."

Browse Source 
This reverts commit r8528 which should be safe after r8646.

BUG=
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/40249004

Cr-Commit-Position: refs/heads/master@{#8648}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8648 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2015-03-09 10:43:18 +00:00
parent a50e6f073d
commit 385b56666a
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/video_engine/vie_capturer.cc
View File

@@ -52,11 +52,8 @@ class RegistrableCpuOveruseMetricsObserver : public CpuOveruseMetricsObserver {
} }
private: private:
// TODO(pbos): Figure out why observer_ needs to be declared above crit_ on
// Mac. tommi@ also ran into this while debugging weird critical-section
// related alignment issues. Pushing this as a workaround to unblock rolling.
CpuOveruseMetricsObserver* observer_ GUARDED_BY(crit_) = nullptr;
mutable rtc::CriticalSection crit_; mutable rtc::CriticalSection crit_;
CpuOveruseMetricsObserver* observer_ GUARDED_BY(crit_) = nullptr;
CpuOveruseMetrics metrics_ GUARDED_BY(crit_); CpuOveruseMetrics metrics_ GUARDED_BY(crit_);
}; };