aboutsummaryrefslogtreecommitdiffstats
path: root/src/gtest.cc
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-02-24 17:19:25 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2010-02-24 17:19:25 +0000
commit3bef459eac9aa84c579f34249aebc9ff56832054 (patch)
treec91cb1205fb45e4a96889ae478afa66a0559694c /src/gtest.cc
parentdd280cfa8dff2247f71a1177d7c8f0c2fde9789a (diff)
downloadgoogletest-3bef459eac9aa84c579f34249aebc9ff56832054.tar.gz
googletest-3bef459eac9aa84c579f34249aebc9ff56832054.tar.bz2
googletest-3bef459eac9aa84c579f34249aebc9ff56832054.zip
Adds threading support (by Miklos Fazekas, Vlad Losev, and Chandler Carruth); adds wide InitGoogleTest to gtest.def (by Vlad Losev); updates the version number (by Zhanyong Wan); updates the release notes for 1.5.0 (by Vlad Losev); removes scons scripts from the distribution (by Zhanyong Wan); adds the cmake build script to the distribution (by Zhanyong Wan); adds fused source files to the distribution (by Vlad Losev and Chandler Carruth).
Diffstat (limited to 'src/gtest.cc')
-rw-r--r--src/gtest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gtest.cc b/src/gtest.cc
index fb5bae94..3306f3fa 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -342,7 +342,7 @@ void AssertHelper::operator=(const Message& message) const {
}
// Mutex for linked pointers.
-Mutex g_linked_ptr_mutex(Mutex::NO_CONSTRUCTOR_NEEDED_FOR_STATIC_MUTEX);
+GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex);
// Application pathname gotten in InitGoogleTest.
String g_executable_path;