diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-02-24 17:21:37 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-02-24 17:21:37 +0000 |
| commit | 5905ba00fe78e522f7253e837ded3ddb5b946934 (patch) | |
| tree | 9cf0d4111261e046ac1fb23673a9c2a8563d2613 /src | |
| parent | 470df42bad6a78531f0ec51e43a194f3e26c4f4d (diff) | |
| download | googletest-5905ba00fe78e522f7253e837ded3ddb5b946934.tar.gz googletest-5905ba00fe78e522f7253e837ded3ddb5b946934.tar.bz2 googletest-5905ba00fe78e522f7253e837ded3ddb5b946934.zip | |
Adds threading support (by Vlad Losev); updates the version number (by Zhanyong Wan); adds release notes for 1.5.0 (by Vlad Losev).
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, |