msvc warnings
This commit is contained in:
		
							parent
							
								
									b15c15ac6e
								
							
						
					
					
						commit
						532cd75c14
					
				@ -31,6 +31,13 @@
 | 
				
			|||||||
//
 | 
					//
 | 
				
			||||||
// This file tests the built-in matchers generated by a script.
 | 
					// 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 "gmock/gmock-generated-matchers.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <list>
 | 
					#include <list>
 | 
				
			||||||
@ -1327,3 +1334,7 @@ TEST(MatcherPMacroTest, WorksOnMoveOnlyType) {
 | 
				
			|||||||
#endif  // GTEST_LASNG_CXX11
 | 
					#endif  // GTEST_LASNG_CXX11
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}  // namespace
 | 
					}  // namespace
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef _MSC_VER
 | 
				
			||||||
 | 
					# pragma warning(pop)
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user