google/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-04 23:06:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Gennadiy Civil
2018-08-17 13:31:01 -04:00
committed by GitHub
parent 7e7e3a6f45 02a8ca8773
commit edc1bc606e
6 changed files with 93 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
googletest/include/gtest/internal/gtest-port.h
View File

@@ -2107,8 +2107,8 @@ class MutexBase {
// 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) \
::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false }
#define GTEST_DEFINE_STATIC_MUTEX_(mutex) \
::testing::internal::MutexBase mutex = {PTHREAD_MUTEX_INITIALIZER, false, 0}
// The Mutex class can only be used for mutexes created at runtime. It
// shares its API with MutexBase otherwise.