diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:03:47 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:03:47 +0000 |
| commit | 762217321f240970b7a7dc404470caedbf43cd5e (patch) | |
| tree | b0b66383100d57a8272e4b622580dff16b5007ee /testing/gmock/src | |
| parent | 7ee7e191bb9f5419b6f6fd9036e6bcdc77d5cc0b (diff) | |
| download | chromium_src-762217321f240970b7a7dc404470caedbf43cd5e.zip chromium_src-762217321f240970b7a7dc404470caedbf43cd5e.tar.gz chromium_src-762217321f240970b7a7dc404470caedbf43cd5e.tar.bz2 | |
Update to current gtest/gmock.
Synced in new gmock, twiddled DEPS for new gtest, updated README.
BUG=34160
Review URL: http://codereview.chromium.org/1151006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gmock/src')
| -rw-r--r-- | testing/gmock/src/gmock-internal-utils.cc | 2 | ||||
| -rw-r--r-- | testing/gmock/src/gmock-spec-builders.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/gmock/src/gmock-internal-utils.cc b/testing/gmock/src/gmock-internal-utils.cc index 4c51ec0..cc51836 100644 --- a/testing/gmock/src/gmock-internal-utils.cc +++ b/testing/gmock/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/testing/gmock/src/gmock-spec-builders.cc b/testing/gmock/src/gmock-spec-builders.cc index 02a3227..dab1a2c 100644 --- a/testing/gmock/src/gmock-spec-builders.cc +++ b/testing/gmock/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, |