Only ignore -Wdeprecated-copy if the used compiler supports the warning

This is needed after
  https://reviews.llvm.org/rG9658d045926545e62cc3f963fe611d7c5d0c9d98
which introduced code that at least didn't compile clean with clang 8.

Reviewed By: xbolva00

Differential Revision: https://reviews.llvm.org/D101288
This commit is contained in:
Dávid Bolvanský 2021-04-26 15:44:52 +02:00
parent 2d4c4d3c54
commit b125c034af
3 changed files with 6 additions and 6 deletions

View File

@ -58,7 +58,7 @@
# include <initializer_list> // NOLINT -- must be after gtest.h
#endif
#ifdef __clang__
#if defined(__clang__) && __has_warning("-Wdeprecated-copy")
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-copy"
#endif
@ -4421,7 +4421,7 @@ inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; }
} // namespace testing
#ifdef __clang__
#if defined(__clang__) && __has_warning("-Wdeprecated-copy")
#pragma clang diagnostic pop
#endif

View File

@ -55,7 +55,7 @@
//
// where all clauses are optional and WillOnce() can be repeated.
#ifdef __clang__
#if defined(__clang__) && __has_warning("-Wdeprecated-copy")
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-copy"
#endif
@ -96,7 +96,7 @@ GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv);
} // namespace testing
#ifdef __clang__
#if defined(__clang__) && __has_warning("-Wdeprecated-copy")
#pragma clang diagnostic pop
#endif
#endif // GMOCK_INCLUDE_GMOCK_GMOCK_H_

View File

@ -54,7 +54,7 @@
#if GTEST_HAS_PARAM_TEST
#ifdef __clang__
#if defined(__clang__) && __has_warning("-Wdeprecated-copy")
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-copy"
#endif
@ -5146,7 +5146,7 @@ CartesianProductHolder10(const Generator1& g1, const Generator2& g2,
} // namespace internal
} // namespace testing
#ifdef __clang__
#if defined(__clang__) && __has_warning("-Wdeprecated-copy")
#pragma clang diagnostic pop
#endif