webrtc/voice_engine/channel_manager.h - Issue 1607353002: Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/voice_engine/channel_manager.h

Issue 1607353002: Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: webrtc/voice_engine/channel_manager.h

diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h

index 4c0cede483f29486028ec39e8237908c9168a6cc..a46d71dc4435f2edd9c3f25e1f258a07c38c8b2c 100644

--- a/webrtc/voice_engine/channel_manager.h

+++ b/webrtc/voice_engine/channel_manager.h

@@ -14,10 +14,10 @@

#include <vector>

#include "webrtc/base/constructormagic.h"

+#include "webrtc/base/criticalsection.h"

#include "webrtc/base/scoped_ptr.h"

#include "webrtc/call/rtc_event_log.h"

#include "webrtc/system_wrappers/include/atomic32.h"

-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"

#include "webrtc/typedefs.h"

namespace webrtc {

@@ -123,7 +123,7 @@ class ChannelManager {

Atomic32 last_channel_id_;

- rtc::scoped_ptr<CriticalSectionWrapper> lock_;

+ mutable rtc::CriticalSection lock_;

std::vector<ChannelOwner> channels_;

const Config& config_;

« webrtc/voice_engine/channel.cc ('K') | « webrtc/voice_engine/channel.cc ('k') | webrtc/voice_engine/channel_manager.cc » ('j') | webrtc/voice_engine/dtmf_inband.cc » ('J')