webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h - Issue 1946133002: Revert of Enable -Winconsistent-missing-override flag.

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/codecs/mock/mock_audio_encoder.h

Issue 1946133002: Revert of Enable -Winconsistent-missing-override flag. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 8 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_coding/codecs/isac/fix/test/isac_speed_test.cc ('k') | webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h

diff --git a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h b/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h

index 2ffb30b708adb1d355dcadaa4510f24b341d34f3..6fafc258ff41962a3cf92e9c5d5582087fdcb427 100644

--- a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h

+++ b/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h

@@ -22,11 +22,7 @@

class MockAudioEncoder : public AudioEncoder {

public:

- // TODO(nisse): Valid overrides commented out, because the gmock

- // methods don't use any override declarations, and we want to avoid

- // warnings from -Winconsistent-missing-override. See

- // http://crbug.com/428099.

- ~MockAudioEncoder() /* override */ { Die(); }

+ ~MockAudioEncoder() override { Die(); }

MOCK_METHOD0(Die, void());

MOCK_METHOD1(Mark, void(std::string desc));

MOCK_CONST_METHOD0(SampleRateHz, int());