diff options
| author | misterg <misterg@google.com> | 2018-08-28 20:24:08 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-31 01:32:41 (GMT) |
| commit | 2cc008538c97189a5130a5598c62574c4972bef4 (patch) | |
| tree | 2973a21775759af879e3200cd9a6aea4e1b5e1a1 /googletest/test/googletest-output-test_.cc | |
| parent | b8e2562086ef326a4a88089f85b29ce7b6f9464b (diff) | |
| download | googletest-2cc008538c97189a5130a5598c62574c4972bef4.zip googletest-2cc008538c97189a5130a5598c62574c4972bef4.tar.gz googletest-2cc008538c97189a5130a5598c62574c4972bef4.tar.bz2 | |
Googletest export
Internal Change
PiperOrigin-RevId: 210594341
Diffstat (limited to 'googletest/test/googletest-output-test_.cc')
| -rw-r--r-- | googletest/test/googletest-output-test_.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc index 180630e..d6f7e0b 100644 --- a/googletest/test/googletest-output-test_.cc +++ b/googletest/test/googletest-output-test_.cc @@ -39,10 +39,6 @@ #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; @@ -1102,8 +1098,6 @@ 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(); } |