webrtc/modules/audio_coding/main/acm2/codec_manager.h - Issue 1432553007: Rename Maybe to Optional

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/acm2/codec_manager.h

Issue 1432553007: Rename Maybe to Optional (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase 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/acm2/codec_manager.h

diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.h b/webrtc/modules/audio_coding/main/acm2/codec_manager.h

index 395e88f7f191f8fb7b40a7f9a891cdade3af920a..37018d345b455f324d9d63ecb2f7f45574e28702 100644

--- a/webrtc/modules/audio_coding/main/acm2/codec_manager.h

+++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.h

@@ -12,7 +12,7 @@

#define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_CODEC_MANAGER_H_

#include "webrtc/base/constructormagic.h"

-#include "webrtc/base/maybe.h"

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

#include "webrtc/base/scoped_ptr.h"

#include "webrtc/base/thread_checker.h"

#include "webrtc/modules/audio_coding/main/acm2/codec_owner.h"

@@ -36,7 +36,7 @@ class CodecManager final {

void RegisterEncoder(AudioEncoder* external_speech_encoder);

- rtc::Maybe<CodecInst> GetCodecInst() const;

+ rtc::Optional<CodecInst> GetCodecInst() const;

bool SetCopyRed(bool enable);