webrtc/modules/audio_coding/main/include/audio_coding_module.h - Issue 1481493004: audio_coding: remove "main" directory

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_coding/main/include/audio_coding_module.h

Issue 1481493004: audio_coding: remove "main" directory (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebased Created 5 years, 1 month ago

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

Jump to:

Index: webrtc/modules/audio_coding/main/include/audio_coding_module.h

diff --git a/webrtc/modules/audio_coding/main/include/audio_coding_module.h b/webrtc/modules/audio_coding/main/include/audio_coding_module.h

index fc3ddd5486ac5b4164e28744ea9f7d66f29908a7..03f408776a7d3daeffe4ca0d1ef01260a8815d72 100644

--- a/webrtc/modules/audio_coding/main/include/audio_coding_module.h

+++ b/webrtc/modules/audio_coding/main/include/audio_coding_module.h

@@ -8,14 +8,16 @@

* be found in the AUTHORS file in the root of the source tree.

-#ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_INCLUDE_AUDIO_CODING_MODULE_H_

-#define WEBRTC_MODULES_AUDIO_CODING_MAIN_INCLUDE_AUDIO_CODING_MODULE_H_

+#ifndef WEBRTC_MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_H_

+#define WEBRTC_MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_H_

+#pragma message("WARNING: audio_coding/main/include is DEPRECATED; use audio_coding/include")

#include <vector>

#include "webrtc/base/optional.h"

#include "webrtc/common_types.h"

-#include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.h"

+#include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"

#include "webrtc/modules/audio_coding/neteq/include/neteq.h"

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

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

@@ -738,4 +740,4 @@ class AudioCodingModule {

} // namespace webrtc

-#endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_INCLUDE_AUDIO_CODING_MODULE_H_

+#endif // WEBRTC_MODULES_AUDIO_CODING_INCLUDE_AUDIO_CODING_MODULE_H_