diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gmock-internal-utils.cc | 2 | ||||
| -rw-r--r-- | src/gmock-spec-builders.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gmock-internal-utils.cc b/src/gmock-internal-utils.cc index 4c51ec00..cc51836b 100644 --- a/src/gmock-internal-utils.cc +++ b/src/gmock-internal-utils.cc @@ -103,7 +103,7 @@ FailureReporterInterface* GetFailureReporter() { } // Protects global resources (stdout in particular) used by Log(). -static Mutex g_log_mutex(Mutex::NO_CONSTRUCTOR_NEEDED_FOR_STATIC_MUTEX); +static GTEST_DEFINE_STATIC_MUTEX_(g_log_mutex); // Returns true iff a log with the given severity is visible according // to the --gmock_verbose flag. diff --git a/src/gmock-spec-builders.cc b/src/gmock-spec-builders.cc index 02a3227f..dab1a2c9 100644 --- a/src/gmock-spec-builders.cc +++ b/src/gmock-spec-builders.cc @@ -53,7 +53,7 @@ namespace internal { // Protects the mock object registry (in class Mock), all function // mockers, and all expectations. -Mutex g_gmock_mutex(Mutex::NO_CONSTRUCTOR_NEEDED_FOR_STATIC_MUTEX); +GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex); // Constructs an ExpectationBase object. ExpectationBase::ExpectationBase(const char* a_file, |