MSVC warnings silence
This commit is contained in:
		
							parent
							
								
									a9a835f3db
								
							
						
					
					
						commit
						3515f3d9cb
					
				@ -39,6 +39,10 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <stdlib.h>
 | 
					#include <stdlib.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if _MSC_VER
 | 
				
			||||||
 | 
					  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127: /* conditional expression is constant */)
 | 
				
			||||||
 | 
					#endif  // . _MSC_VER    
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if GTEST_IS_THREADSAFE
 | 
					#if GTEST_IS_THREADSAFE
 | 
				
			||||||
using testing::ScopedFakeTestPartResultReporter;
 | 
					using testing::ScopedFakeTestPartResultReporter;
 | 
				
			||||||
using testing::TestPartResultArray;
 | 
					using testing::TestPartResultArray;
 | 
				
			||||||
@ -1098,6 +1102,8 @@ int main(int argc, char **argv) {
 | 
				
			|||||||
  // are registered, and torn down in the reverse order.
 | 
					  // are registered, and torn down in the reverse order.
 | 
				
			||||||
  testing::AddGlobalTestEnvironment(new FooEnvironment);
 | 
					  testing::AddGlobalTestEnvironment(new FooEnvironment);
 | 
				
			||||||
  testing::AddGlobalTestEnvironment(new BarEnvironment);
 | 
					  testing::AddGlobalTestEnvironment(new BarEnvironment);
 | 
				
			||||||
 | 
					#if _MSC_VER
 | 
				
			||||||
 | 
					  GTEST_DISABLE_MSC_WARNINGS_POP()
 | 
				
			||||||
 | 
					#endif  // . _MSC_VER    
 | 
				
			||||||
  return RunAllTests();
 | 
					  return RunAllTests();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user