typo
This commit is contained in:
		
							parent
							
								
									10e8ec2714
								
							
						
					
					
						commit
						881ee307a7
					
				@ -33,6 +33,13 @@
 | 
				
			|||||||
//
 | 
					//
 | 
				
			||||||
// This file tests some commonly used argument matchers.
 | 
					// This file tests some commonly used argument matchers.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// Disable MSVC2015 warning for std::pair:
 | 
				
			||||||
 | 
					// "decorated name length exceeded, name was truncated".
 | 
				
			||||||
 | 
					#if defined _MSC_VER
 | 
				
			||||||
 | 
					# pragma warning(push)
 | 
				
			||||||
 | 
					# pragma warning(disable:4503)
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "gmock/gmock-matchers.h"
 | 
					#include "gmock/gmock-matchers.h"
 | 
				
			||||||
#include "gmock/gmock-more-matchers.h"
 | 
					#include "gmock/gmock-more-matchers.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -59,13 +66,6 @@
 | 
				
			|||||||
# include <forward_list>  // NOLINT
 | 
					# include <forward_list>  // NOLINT
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Disable MSVC2015 warning for std::pair:
 | 
					 | 
				
			||||||
// "decorated name length exceeded, name was truncated".
 | 
					 | 
				
			||||||
#if defined _MSC_VER
 | 
					 | 
				
			||||||
# pragma warning(push)
 | 
					 | 
				
			||||||
# pragma warning(disable:4503)
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#if GTEST_LANG_CXX11
 | 
					#if GTEST_LANG_CXX11
 | 
				
			||||||
# include <type_traits>
 | 
					# include <type_traits>
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user