webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h - Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)"

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/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)

Patch Set: Created 3 years, 6 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

« no previous file with comments | « webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h ('k') | webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

index 865de6f5e598c17413c42f0d34e3b33c49d9446f..6ed716329aa6bc25e3980683f00d01a6bb1b7037 100644

--- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

+++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

@@ -15,11 +15,11 @@

#include <map>

#include <memory>

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

#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"

#include "webrtc/modules/audio_conference_mixer/source/memory_pool.h"

#include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h"

#include "webrtc/modules/include/module_common_types.h"

-#include "webrtc/rtc_base/criticalsection.h"

#include "webrtc/typedefs.h"

namespace webrtc {