msvc warnings
This commit is contained in:
		@@ -31,6 +31,13 @@
 | 
			
		||||
//
 | 
			
		||||
// This file tests the built-in matchers generated by a script.
 | 
			
		||||
 | 
			
		||||
// Silence warning C4244: 'initializing': conversion from 'int' to 'short',
 | 
			
		||||
// possible loss of data
 | 
			
		||||
#ifdef _MSC_VER
 | 
			
		||||
# pragma warning(push)
 | 
			
		||||
# pragma warning(disable:C4244)
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#include "gmock/gmock-generated-matchers.h"
 | 
			
		||||
 | 
			
		||||
#include <list>
 | 
			
		||||
@@ -1327,3 +1334,7 @@ TEST(MatcherPMacroTest, WorksOnMoveOnlyType) {
 | 
			
		||||
#endif  // GTEST_LASNG_CXX11
 | 
			
		||||
 | 
			
		||||
}  // namespace
 | 
			
		||||
 | 
			
		||||
#ifdef _MSC_VER
 | 
			
		||||
# pragma warning(pop)
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user