diff options
| author | mark a. foltz <mfoltz@chromium.org> | 2018-08-29 14:20:53 -0700 |
|---|---|---|
| committer | mark a. foltz <mfoltz@chromium.org> | 2018-08-29 23:08:33 +0000 |
| commit | c58d33a8f0cfd62f9b327065dfb2dcc7c3e23132 (patch) | |
| tree | 33829a34fe2333702a52d0411056976f8d2c0294 /third_party/googletest | |
| parent | dd54ff4d53b4416247c635f32b308c8407604238 (diff) | |
| download | openscreen-c58d33a8f0cfd62f9b327065dfb2dcc7c3e23132.tar.gz | |
[OSP] Fix compilation errors.
- Fix typo in #include guard.
- GMock does not add the 'override' keyword when mocking pure virtual methods (ref:
https://github.com/google/googletest/issues/533). This looks unlikely to be fixed
anytime soon, so suppress this warning.
Bug: openscreen:15
Change-Id: I54ae3c87b4a4aed8907fac9d3a63f2fd78900327
Reviewed-on: https://chromium-review.googlesource.com/1195590
Reviewed-by: Brandon Tolsch <btolsch@chromium.org>
Diffstat (limited to 'third_party/googletest')
| -rw-r--r-- | third_party/googletest/BUILD.gn | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn index 34e4b4f7..bb3271e6 100644 --- a/third_party/googletest/BUILD.gn +++ b/third_party/googletest/BUILD.gn @@ -11,6 +11,11 @@ config("gtest_config") { config("gmock_config") { visibility = [ ":*" ] + cflags_cc = [ + # issue/15: GMock does not support the override keyword. + "-Wno-inconsistent-missing-override", + ] + include_dirs = [ "src/googlemock/include" ] } |