Skip to content

Commit

Permalink
Only ignore -Wdeprecated-copy if the used compiler supports the warning
Browse files Browse the repository at this point in the history
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
  • Loading branch information
davidbolvansky committed Apr 26, 2021
1 parent 2d4c4d3 commit b125c03
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions llvm/utils/unittest/googlemock/include/gmock/gmock.h
Expand Up @@ -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
Expand Down Expand Up @@ -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_
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit b125c03

Please sign in to comment.