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 /include | |
| 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 'include')
| -rw-r--r-- | include/gmock/gmock-spec-builders.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index d8d4749a..9b60f692 100644 --- a/include/gmock/gmock-spec-builders.h +++ b/include/gmock/gmock-spec-builders.h @@ -112,7 +112,7 @@ template <typename F> class FunctionMockerBase; // expectations when InSequence() is used, and thus affect which // expectation gets picked. Therefore, we sequence all mock function // calls to ensure the integrity of the mock objects' states. -extern Mutex g_gmock_mutex; +GTEST_DECLARE_STATIC_MUTEX_(g_gmock_mutex); // Abstract base class of FunctionMockerBase. This is the // type-agnostic part of the function mocker interface. Its pure |