webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc - Issue 1944743002: 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/neteq/neteq_impl_unittest.cc

Issue 1944743002: 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/opus/opus_speed_test.cc ('k') | webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

index 77622bc4573a75174d764362b807d25f1840c213..42f2c1e338d67649470cd1a8e659dc66c07531ff 100644

--- a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

+++ b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

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

class MockAudioDecoder : public AudioDecoder {

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.

- void Reset() /* override */ {}

+ void Reset() override {}

MOCK_CONST_METHOD2(PacketDuration, int(const uint8_t*, size_t));

MOCK_METHOD5(DecodeInternal, int(const uint8_t*, size_t, int, int16_t*,

SpeechType*));

- size_t Channels() const /* override */ { return kChannels; }

+ size_t Channels() const override { return kChannels; }

} decoder_;

const uint8_t kFirstPayloadValue = 1;