Merge pull request #905 from iignatev/master
enable null detection on Solaris Studio 12u4+
This commit is contained in:
		
						commit
						be0f3823ba
					
				@ -2210,12 +2210,13 @@ class ThreadLocal {
 | 
			
		||||
GTEST_API_ size_t GetThreadCount();
 | 
			
		||||
 | 
			
		||||
// Passing non-POD classes through ellipsis (...) crashes the ARM
 | 
			
		||||
// compiler and generates a warning in Sun Studio.  The Nokia Symbian
 | 
			
		||||
// compiler and generates a warning in Sun Studio before 12u4. The Nokia Symbian
 | 
			
		||||
// and the IBM XL C/C++ compiler try to instantiate a copy constructor
 | 
			
		||||
// for objects passed through ellipsis (...), failing for uncopyable
 | 
			
		||||
// objects.  We define this to ensure that only POD is passed through
 | 
			
		||||
// ellipsis on these systems.
 | 
			
		||||
#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || defined(__SUNPRO_CC)
 | 
			
		||||
#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || \
 | 
			
		||||
     (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x5130)
 | 
			
		||||
// We lose support for NULL detection where the compiler doesn't like
 | 
			
		||||
// passing non-POD classes through ellipsis (...).
 | 
			
		||||
# define GTEST_ELLIPSIS_NEEDS_POD_ 1
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user