zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suppress C5041 constexpr warning for MSVC 2019

Browse Source 
Disable the C5041 warning which makes the build fail. This is a
C++17-only change and WebRTC doesn't support C++17 yet, so the code is
technically correct, but fails to build on MSVC 2019 and
warning-as-error active.

Also fix another warning-as-error build error with MSVC 2019 due to
ignoring the result of a [[nodiscard]] function.

No-Presubmit: True
Bug: webrtc:11275,webrtc:11276
Change-Id: I891a894ee87252f96e84fd8d282576f46907256f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165781
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30244}
This commit is contained in:
Jerome Humbert
2020-01-13 11:58:26 +00:00
committed by Commit Bot
parent 2ea27968d3
commit 3e3c551ac6
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/audio_coding/BUILD.gn
View File

@ -1272,12 +1272,12 @@ rtc_library("audio_coding_modules_tests_shared") {
if (rtc_include_tests) {
audio_coding_deps = [
"../../common_audio",
"../../system_wrappers",
":audio_encoder_cng",
":g711",
":g722",
":pcm16b",
"../../common_audio",
"../../system_wrappers",
]
if (rtc_include_ilbc) {
audio_coding_deps += [ ":ilbc" ]

3
modules/audio_coding/acm2/acm_receiver_unittest.cc
View File

@ -289,7 +289,8 @@ TEST_F(AcmReceiverTestPostDecodeVadPassiveOldApi, MAYBE_PostdecodingVad) {
constexpr int payload_type = 34;
const SdpAudioFormat codec = {"L16", 16000, 1};
const AudioCodecInfo info = SetEncoder(payload_type, codec);
encoder_factory_->QueryAudioEncoder(codec).value();
auto const value = encoder_factory_->QueryAudioEncoder(codec);
ASSERT_TRUE(value.has_value());
receiver_->SetCodecs({{payload_type, codec}});
const int kNumPackets = 5;
AudioFrame frame;