commit 3e3c551ac63c0bacda15004a60f19f3b8505e558
author Jerome Humbert <jerome.humbert@microsoft.com> Mon Jan 13 11:58:26 2020
committer Commit Bot <commit-bot@chromium.org> Tue Jan 14 07:44:35 2020
tree 3067eacafe5d7a4b8ee4d16ae55db359adc40c3a
parent 2ea27968d35b9ce744c15130248cfe8f455aa7b1

Suppress C5041 constexpr warning for MSVC 2019

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}

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index eaa7ad5..49227d9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -334,6 +334,9 @@
       # TODO(bugs.webrtc.org/9274): Remove these warnings as soon as MSVC allows
       # external headers warning suppression (or fix them upstream).
       cflags += [ "/wd4702" ]  # unreachable code
+
+      # MSVC 2019 warning suppressions for C++17 compiling
+      cflags += [ "/wd5041" ]  # out-of-line definition for constexpr static data member is not needed and is deprecated in C++17
     }
   }
 

modules/audio_coding/BUILD.gn

diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index ec00aad..3935105 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1272,12 +1272,12 @@
 
 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" ]

modules/audio_coding/acm2/acm_receiver_unittest.cc

diff --git a/modules/audio_coding/acm2/acm_receiver_unittest.cc b/modules/audio_coding/acm2/acm_receiver_unittest.cc
index 175d11f..74a0c7a 100644
--- a/modules/audio_coding/acm2/acm_receiver_unittest.cc
+++ b/modules/audio_coding/acm2/acm_receiver_unittest.cc
@@ -289,7 +289,8 @@
   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;