Fixes tr1 tuple's path when compiled with gcc version < 4.0.0 (by Zhanyong Wan).
This commit is contained in:
		@@ -48,12 +48,14 @@
 | 
			
		||||
// To avoid conditional compilation everywhere, we make it
 | 
			
		||||
// gmock-port.h's responsibility to #include the header implementing
 | 
			
		||||
// tr1/tuple.
 | 
			
		||||
#if defined(__GNUC__)
 | 
			
		||||
// GCC implements tr1/tuple in the <tr1/tuple> header.  This does not
 | 
			
		||||
// conform to the TR1 spec, which requires the header to be <tuple>.
 | 
			
		||||
#if defined(__GNUC__) && GTEST_GCC_VER_ >= 40000
 | 
			
		||||
// GTEST_GCC_VER_ is defined in gtest-port.h and 40000 corresponds to
 | 
			
		||||
// version 4.0.0.
 | 
			
		||||
// GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header.  This does
 | 
			
		||||
// not conform to the TR1 spec, which requires the header to be <tuple>.
 | 
			
		||||
#include <tr1/tuple>
 | 
			
		||||
#else
 | 
			
		||||
// If the compiler is not GCC, we assume the user is using a
 | 
			
		||||
// If the compiler is not GCC 4.0+, we assume the user is using a
 | 
			
		||||
// spec-conforming TR1 implementation.
 | 
			
		||||
#include <tuple>
 | 
			
		||||
#endif  // __GNUC__
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user