From bb19fcf3bdbbf3752bed2290df0d43475fb2eb08 Mon Sep 17 00:00:00 2001 From: Karl Wiberg Date: Sat, 7 Apr 2018 05:17:33 +0200 Subject: [PATCH] Add explicit cast to void to silence -Wcomma warning Bug: webrtc:9014 Change-Id: I390a8d722e40a101c29ca7a71c6429cba26c17ee Reviewed-on: https://webrtc-review.googlesource.com/67560 Reviewed-by: Henrik Lundin Commit-Queue: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#22787} --- modules/audio_coding/codecs/cng/audio_encoder_cng.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng.cc index 78148ab350..dc4c21e375 100644 --- a/modules/audio_coding/codecs/cng/audio_encoder_cng.cc +++ b/modules/audio_coding/codecs/cng/audio_encoder_cng.cc @@ -44,19 +44,19 @@ bool AudioEncoderCng::Config::IsOk() const { } AudioEncoderCng::AudioEncoderCng(Config&& config) - : speech_encoder_( - ([&] { RTC_CHECK(config.IsOk()) << "Invalid configuration."; }(), - std::move(config.speech_encoder))), + : speech_encoder_((static_cast([&] { + RTC_CHECK(config.IsOk()) << "Invalid configuration."; + }()), + std::move(config.speech_encoder))), cng_payload_type_(config.payload_type), num_cng_coefficients_(config.num_cng_coefficients), sid_frame_interval_ms_(config.sid_frame_interval_ms), last_frame_active_(true), vad_(config.vad ? std::unique_ptr(config.vad) - : CreateVad(config.vad_mode)), + : CreateVad(config.vad_mode)), cng_encoder_(new ComfortNoiseEncoder(SampleRateHz(), sid_frame_interval_ms_, - num_cng_coefficients_)) { -} + num_cng_coefficients_)) {} AudioEncoderCng::~AudioEncoderCng() = default;