Googletest export

Silence MSVC warnings

PiperOrigin-RevId: 210726964
This commit is contained in:
misterg
2018-08-29 11:39:59 -04:00
committed by Gennadiy Civil
parent 00d1ffc8c8
commit 41b539941f
2 changed files with 15 additions and 1 deletions

View File

@@ -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();
}