aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-16 15:28:20 -0400
committerGitHub <noreply@github.com>2018-08-16 15:28:20 -0400
commitf87798a3f7c73e069becf5792d0443d5cba42434 (patch)
treed33d05629648a93c9eebeab26abe6e44d82f8b05
parent8b34930c62c21c281bfd756b05a471cca2312aca (diff)
parentd20fa182a60c77b58eac272b85d7f884fb650bb0 (diff)
downloadgoogletest-f87798a3f7c73e069becf5792d0443d5cba42434.tar.gz
googletest-f87798a3f7c73e069becf5792d0443d5cba42434.tar.bz2
googletest-f87798a3f7c73e069becf5792d0443d5cba42434.zip
Merge pull request #1646 from tisi1988/master
FIX: Compilation warning with GCC regarding a non-initialised member …
-rw-r--r--googletest/include/gtest/internal/gtest-port.h4
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 a0d318cd..786497d8 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.