From 6e55c38c216fb9dec339670eafd92ffd8480db2c Mon Sep 17 00:00:00 2001 From: Alex Loiko Date: Fri, 22 Dec 2017 15:10:32 +0100 Subject: [PATCH] Remove an unnecessary non-const-iterator function. With an old C++-11 std-library, this gave compilation errors. A const iterator couldn't be used in a non-const setting. One couldn't call vector.erase(iter) on it. Now it seems we have updated to a less old C++ standard lib version (it passes on the bots). Bug: None Change-Id: Iae37d49ed06e1635f55c8a31651171585aea6d8d Reviewed-on: https://webrtc-review.googlesource.com/36160 Reviewed-by: Sam Zackrisson Commit-Queue: Alex Loiko Cr-Commit-Position: refs/heads/master@{#21431} --- modules/audio_mixer/audio_mixer_impl.cc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/modules/audio_mixer/audio_mixer_impl.cc b/modules/audio_mixer/audio_mixer_impl.cc index 34b4ae54fe..0940c59d51 100644 --- a/modules/audio_mixer/audio_mixer_impl.cc +++ b/modules/audio_mixer/audio_mixer_impl.cc @@ -88,18 +88,6 @@ AudioMixerImpl::SourceStatusList::const_iterator FindSourceInList( return p->audio_source == audio_source; }); } - -// TODO(aleloi): remove non-const version when WEBRTC only supports modern STL. -AudioMixerImpl::SourceStatusList::iterator FindSourceInList( - AudioMixerImpl::Source const* audio_source, - AudioMixerImpl::SourceStatusList* audio_source_list) { - return std::find_if( - audio_source_list->begin(), audio_source_list->end(), - [audio_source](const std::unique_ptr& p) { - return p->audio_source == audio_source; - }); -} - } // namespace AudioMixerImpl::AudioMixerImpl(