diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-17 17:31:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 17:31:01 (GMT) |
| commit | edc1bc606eb46c6786710a6e6303bb91400b2fe0 (patch) | |
| tree | 3efa24596fe5d94d9b82ca8070ffa70852a8520a /googletest/include | |
| parent | 7e7e3a6f45db62d470c9d15b062582e9e95d3bcd (diff) | |
| parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
| download | googletest-edc1bc606eb46c6786710a6e6303bb91400b2fe0.zip googletest-edc1bc606eb46c6786710a6e6303bb91400b2fe0.tar.gz googletest-edc1bc606eb46c6786710a6e6303bb91400b2fe0.tar.bz2 | |
Merge branch 'master' into patch-1
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index a0d318c..786497d 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -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. |