merging gtest-port.h, again - 1
This commit is contained in:
		
							parent
							
								
									7888184f28
								
							
						
					
					
						commit
						87a4cdddd0
					
				@ -228,10 +228,9 @@
 | 
				
			|||||||
//
 | 
					//
 | 
				
			||||||
// Regular expressions:
 | 
					// Regular expressions:
 | 
				
			||||||
//   RE             - a simple regular expression class using the POSIX
 | 
					//   RE             - a simple regular expression class using the POSIX
 | 
				
			||||||
//                    Extended Regular Expression syntax on UNIX-like
 | 
					//                    Extended Regular Expression syntax on UNIX-like platforms
 | 
				
			||||||
//                    platforms, or a reduced regular exception syntax on
 | 
					//                    or a reduced regular exception syntax on other
 | 
				
			||||||
//                    other platforms, including Windows.
 | 
					//                    platforms, including Windows.
 | 
				
			||||||
//
 | 
					 | 
				
			||||||
// Logging:
 | 
					// Logging:
 | 
				
			||||||
//   GTEST_LOG_()   - logs messages at the specified severity level.
 | 
					//   GTEST_LOG_()   - logs messages at the specified severity level.
 | 
				
			||||||
//   LogToStderr()  - directs all log messages to stderr.
 | 
					//   LogToStderr()  - directs all log messages to stderr.
 | 
				
			||||||
@ -2093,8 +2092,13 @@ class MutexBase {
 | 
				
			|||||||
     extern ::testing::internal::MutexBase mutex
 | 
					     extern ::testing::internal::MutexBase mutex
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Defines and statically (i.e. at link time) initializes a static mutex.
 | 
					// Defines and statically (i.e. at link time) initializes a static mutex.
 | 
				
			||||||
 | 
					// The initialization list here does not explicitly initialize each field,
 | 
				
			||||||
 | 
					// instead relying on default initialization for the unspecified fields. In
 | 
				
			||||||
 | 
					// particular, the owner_ field (a pthread_t) is not explicitly initialized.
 | 
				
			||||||
 | 
					// This allows initialization to work whether pthread_t is a scalar or struct.
 | 
				
			||||||
 | 
					// The flag -Wmissing-field-initializers must not be specified for this to work.
 | 
				
			||||||
#  define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
 | 
					#  define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
 | 
				
			||||||
     ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false, pthread_t() }
 | 
					     ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// The Mutex class can only be used for mutexes created at runtime. It
 | 
					// The Mutex class can only be used for mutexes created at runtime. It
 | 
				
			||||||
// shares its API with MutexBase otherwise.
 | 
					// shares its API with MutexBase otherwise.
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user