admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warning 4373.

Browse Source 
Looks like all the current warnings were because of a MSVC bug:
https://github.com/google/googletest/blob/master/googlemock/docs/FrequentlyAskedQuestions.md

We can just disable this one for all tests and be done with it.

Bug: webrtc:261
Change-Id: I882a577f832ff71ac61936abebe0ca537088bab8
Reviewed-on: https://webrtc-review.googlesource.com/40840
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21691}
This commit is contained in:
Patrik Höglund 2018-01-19 09:11:07 +01:00 committed by Commit Bot
parent 9e539f0959
commit 34924c236c
7 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
media/BUILD.gn
View File

@ -560,7 +560,6 @@ if (rtc_include_tests) {
if (is_win) {
cflags = [
"/wd4245", # conversion from int to size_t, signed/unsigned mismatch.
"/wd4373", # virtual function override.
"/wd4389", # signed/unsigned mismatch.
]
}

8
modules/BUILD.gn
View File

@ -118,14 +118,6 @@ if (rtc_include_tests) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
if (is_win) {
cflags = [
# TODO(phoglund): get rid of 4373 supression when
# http://code.google.com/p/webrtc/issues/detail?id=261 is solved.
# legacy warning for ignoring const / volatile in signatures.
"/wd4373",
]
}
}
modules_unittests_resources = [

12
modules/audio_device/BUILD.gn
View File

@ -292,17 +292,6 @@ rtc_source_set("mac_portaudio") {
]
}
config("mock_audio_device_config") {
if (is_win) {
cflags = [
# TODO(phoglund): get rid of 4373 supression when
# http://code.google.com/p/webrtc/issues/detail?id=261 is solved.
# legacy warning for ignoring const / volatile in signatures.
"/wd4373",
]
}
}
rtc_source_set("mock_audio_device") {
testonly = true
sources = [
@ -314,7 +303,6 @@ rtc_source_set("mock_audio_device") {
":audio_device",
"../../test:test_support",
]
all_dependent_configs = [ ":mock_audio_device_config" ]
}
if (rtc_include_tests) {

7
modules/remote_bitrate_estimator/BUILD.gn
View File

@ -131,13 +131,6 @@ if (rtc_include_tests) {
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
if (is_win) {
cflags = [
# TODO(kjellander): Bug 261: fix this warning.
"/wd4373", # virtual function override.
]
}
deps = [
":remote_bitrate_estimator",
"..:module_api",

7
modules/rtp_rtcp/BUILD.gn
View File

@ -221,13 +221,6 @@ rtc_static_library("rtp_rtcp") {
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
if (is_win) {
cflags = [
# TODO(kjellander): Bug 261: fix this warning.
"/wd4373", # virtual function override.
]
}
}
rtc_source_set("rtcp_transceiver") {

6
modules/video_coding/BUILD.gn
View File

@ -707,12 +707,6 @@ if (rtc_include_tests) {
if (rtc_build_libvpx) {
deps += [ rtc_libvpx_dir ]
}
if (is_win) {
cflags = [
# TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
"/wd4373", # virtual function override.
]
}
# TODO(jschuh): bugs.webrtc.org/1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]

18
test/BUILD.gn
View File

@ -149,10 +149,23 @@ if (is_ios) {
}
}
config("suppress_warning_4373") {
if (is_win) {
cflags = [
# MSVC has a bug which generates this warning when using mocks; see the
# section on warning 4373 in he googlemock FAQ. This warning isn't the
# least relevant for us, anyway.
"/wd4373",
]
}
}
rtc_source_set("test_support") {
visibility = [ "*" ]
testonly = true
all_dependent_configs = [ ":suppress_warning_4373" ]
sources = [
"gmock.h",
"gtest.h",
@ -344,11 +357,6 @@ if (rtc_include_tests) {
# TODO(jschuh): Bug 1348: fix this warning.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
if (is_win) {
# virtual override w/different const/volatile signature.
cflags = [ "/wd4373" ]
}
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]