6363#pragma clang diagnostic push
6464#pragma clang diagnostic ignored "-Wsign-compare"
6565#elif __GNUC__
66- #pragma gcc diagnostic push
67- #pragma gcc diagnostic ignored "-Wsign-compare"
66+ #pragma GCC diagnostic push
67+ #pragma GCC diagnostic ignored "-Wsign-compare"
68+ #pragma GCC diagnostic ignored "-Wconversion"
6869#endif
6970
7071// Copyright 2005, Google Inc.
@@ -18353,8 +18354,8 @@ AssertionResult CmpHelperEQ(const char* expected_expression,
1835318354#pragma clang diagnostic push
1835418355#pragma clang diagnostic ignored "-Wsign-compare"
1835518356#elif __GNUC__
18356- #pragma gcc diagnostic push
18357- #pragma gcc diagnostic ignored "-Wsign-compare"
18357+ #pragma GCC diagnostic push
18358+ #pragma GCC diagnostic ignored "-Wsign-compare"
1835818359#endif
1835918360
1836018361 if (expected == actual) {
@@ -18366,7 +18367,7 @@ AssertionResult CmpHelperEQ(const char* expected_expression,
1836618367#elif __clang__
1836718368#pragma clang diagnostic pop
1836818369#elif __GNUC__
18369- #pragma gcc diagnostic pop
18370+ #pragma GCC diagnostic pop
1837018371#endif
1837118372
1837218373 return EqFailure(expected_expression,
@@ -19564,7 +19565,7 @@ bool StaticAssertTypeEq() {
1956419565#if __clang__
1956519566#pragma clang diagnostic pop
1956619567#elif __GNUC__
19567- #pragma gcc diagnostic pop
19568+ #pragma GCC diagnostic pop
1956819569#endif
1956919570
1957019571#endif // GTEST_INCLUDE_GTEST_GTEST_H_
0 commit comments