diff options
| author | misterg <misterg@google.com> | 2018-08-29 15:39:59 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-31 01:33:02 (GMT) |
| commit | 41b539941f8563e00dff5fc9d01510cb02d6467d (patch) | |
| tree | d908bf2afb78c75fea65b789fa087db0486518b1 /googletest/test | |
| parent | 00d1ffc8c85234fb8fe873d1591374289de1356d (diff) | |
| download | googletest-41b539941f8563e00dff5fc9d01510cb02d6467d.zip googletest-41b539941f8563e00dff5fc9d01510cb02d6467d.tar.gz googletest-41b539941f8563e00dff5fc9d01510cb02d6467d.tar.bz2 | |
Googletest export
Silence MSVC warnings
PiperOrigin-RevId: 210726964
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-output-test_.cc | 8 | ||||
| -rw-r--r-- | googletest/test/gtest-typed-test_test.cc | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc index df82517..f6525ec 100644 --- a/googletest/test/googletest-output-test_.cc +++ b/googletest/test/googletest-output-test_.cc @@ -39,6 +39,10 @@ #include <stdlib.h> +#if _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */) +#endif // _MSC_VER + #if GTEST_IS_THREADSAFE using testing::ScopedFakeTestPartResultReporter; using testing::TestPartResultArray; @@ -1098,6 +1102,8 @@ int main(int argc, char **argv) { // are registered, and torn down in the reverse order. testing::AddGlobalTestEnvironment(new FooEnvironment); testing::AddGlobalTestEnvironment(new BarEnvironment); - +#if _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127 +#endif // _MSC_VER return RunAllTests(); } diff --git a/googletest/test/gtest-typed-test_test.cc b/googletest/test/gtest-typed-test_test.cc index b245730..4e39869 100644 --- a/googletest/test/gtest-typed-test_test.cc +++ b/googletest/test/gtest-typed-test_test.cc @@ -35,6 +35,10 @@ #include "gtest/gtest.h" +#if _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */) +#endif // _MSC_VER + using testing::Test; // Used for testing that SetUpTestCase()/TearDownTestCase(), fixture @@ -450,4 +454,8 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, TrimmedTest, TrimTypes); // must be defined). This dummy test keeps gtest_main linked in. TEST(DummyTest, TypedTestsAreNotSupportedOnThisPlatform) {} +#if _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127 +#endif // _MSC_VER + #endif // #if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P) |