diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-29 03:25:51 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 03:25:51 (GMT) |
| commit | 8c0e0d5c17f9d7395bd0e0caaa8f4707561be2a2 (patch) | |
| tree | dcd0d435850483c824053ba7b850fc3f210fe436 /googletest | |
| parent | 9d9d7a6a8904b628dd17456a6714155b19be84b8 (diff) | |
| download | googletest-8c0e0d5c17f9d7395bd0e0caaa8f4707561be2a2.zip googletest-8c0e0d5c17f9d7395bd0e0caaa8f4707561be2a2.tar.gz googletest-8c0e0d5c17f9d7395bd0e0caaa8f4707561be2a2.tar.bz2 | |
MSVC warnings silence
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/test/googletest-output-test_.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc index d6f7e0b..cfae881 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() +#endif // . _MSC_VER return RunAllTests(); } |