aboutsummaryrefslogtreecommitdiff
path: root/third_party/googletest
diff options
context:
space:
mode:
authormark a. foltz <mfoltz@chromium.org>2019-10-14 10:27:35 -0700
committerCommit Bot <commit-bot@chromium.org>2019-10-14 21:33:22 +0000
commit3c7b219515ea1d2e10377405be8631ff20c7070d (patch)
tree94a607dd9fd8eb3bfd99c5d50b3b3504d895213a /third_party/googletest
parentdb917af5a447d616cfdbb8ad7db7377ba42214aa (diff)
downloadopenscreen-3c7b219515ea1d2e10377405be8631ff20c7070d.tar.gz
[Open Screen] Final round of gcc fixes.
1. Removes a couple of clang-specific flags from the gcc build. 2. Adds -Wno-noexcept-type to the gcc build. Regarding #2: Methods passing platform::api::Task were triggering noexcept warnings on gcc (check the waterfall for examples). However, after reviewing options, there does not seem to be a straightforward and typesafe fix possible while maintaining the current TaskRunner APIs. Either we would need to remove noexcept from platform::api::Task, or add extra template parameters to specialize Task-passing methods. The gcc bots are running Bionic Beaver, which defaults to gcc 7. Locally, the compilation errors do not reproduce with gcc 8.3, leading me to believe that these were removed for this specific case between gcc 7 and gcc 8. (I will try to hunt down documentation if that is the case.) I believe this is a reasonable solution until we can get bots upgraded to gcc 8.3. Bug: openscreen:40 Change-Id: Ic4b0ee95a204319e3c85e7fef3dcbcdde4e0e5a7 Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1857468 Commit-Queue: mark a. foltz <mfoltz@chromium.org> Reviewed-by: Ryan Keane <rwkeane@google.com> Reviewed-by: Max Yakimakha <yakimakha@chromium.org>
Diffstat (limited to 'third_party/googletest')
-rw-r--r--third_party/googletest/BUILD.gn11
1 files changed, 6 insertions, 5 deletions
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
index 079df859..be551bcb 100644
--- a/third_party/googletest/BUILD.gn
+++ b/third_party/googletest/BUILD.gn
@@ -32,12 +32,13 @@ if (build_with_chromium) {
config("gmock_config") {
visibility = [ ":*" ]
- cflags_cc = [
- # issue/15: GMock does not support the override keyword.
- "-Wno-inconsistent-missing-override",
- ]
+ cflags_cc = []
if (is_clang) {
- cflags_cc += [ "-Wno-exit-time-destructors" ]
+ # issue/15: GMock does not support the override keyword.
+ cflags_cc += [
+ "-Wno-exit-time-destructors",
+ "-Wno-inconsistent-missing-override",
+ ]
}
include_dirs = [ "src/googlemock/include" ]