Fixed warning
This commit is contained in:
parent
5dd605d3a2
commit
b952376968
@ -42,8 +42,9 @@
|
|||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
#pragma clang diagnostic ignored "-Wsign-conversion"
|
#pragma clang diagnostic ignored "-Wsign-conversion"
|
||||||
#elif __GNUC__
|
#elif __GNUC__
|
||||||
#pragma gcc diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma gcc diagnostic ignored "-Wsign-conversion"
|
#pragma GCC diagnostic ignored "-Wsign-conversion"
|
||||||
|
#pragma GCC diagnostic ignored "-Wconversion"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// The following lines pull in the real gtest *.cc files.
|
// The following lines pull in the real gtest *.cc files.
|
||||||
@ -9127,5 +9128,5 @@ const char* TypedTestCasePState::VerifyRegisteredTestNames(
|
|||||||
#if __clang__
|
#if __clang__
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#elif __GNUC__
|
#elif __GNUC__
|
||||||
#pragma gcc diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
|
@ -63,8 +63,9 @@
|
|||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
#pragma clang diagnostic ignored "-Wsign-compare"
|
#pragma clang diagnostic ignored "-Wsign-compare"
|
||||||
#elif __GNUC__
|
#elif __GNUC__
|
||||||
#pragma gcc diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma gcc diagnostic ignored "-Wsign-compare"
|
#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||||
|
#pragma GCC diagnostic ignored "-Wconversion"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Copyright 2005, Google Inc.
|
// Copyright 2005, Google Inc.
|
||||||
@ -18353,8 +18354,8 @@ AssertionResult CmpHelperEQ(const char* expected_expression,
|
|||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
#pragma clang diagnostic ignored "-Wsign-compare"
|
#pragma clang diagnostic ignored "-Wsign-compare"
|
||||||
#elif __GNUC__
|
#elif __GNUC__
|
||||||
#pragma gcc diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma gcc diagnostic ignored "-Wsign-compare"
|
#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (expected == actual) {
|
if (expected == actual) {
|
||||||
@ -18366,7 +18367,7 @@ AssertionResult CmpHelperEQ(const char* expected_expression,
|
|||||||
#elif __clang__
|
#elif __clang__
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#elif __GNUC__
|
#elif __GNUC__
|
||||||
#pragma gcc diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return EqFailure(expected_expression,
|
return EqFailure(expected_expression,
|
||||||
@ -19564,7 +19565,7 @@ bool StaticAssertTypeEq() {
|
|||||||
#if __clang__
|
#if __clang__
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#elif __GNUC__
|
#elif __GNUC__
|
||||||
#pragma gcc diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // GTEST_INCLUDE_GTEST_GTEST_H_
|
#endif // GTEST_INCLUDE_GTEST_GTEST_H_
|
||||||
|
Loading…
x
Reference in New Issue
Block a user