summaryrefslogtreecommitdiff
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
commit050a520ddf9a34b93a3b41704fa2450d7450783f (patch)
treec91cb1205fb45e4a96889ae478afa66a0559694c /src/gtest.cc
parent6851df92502ee6b9b96f008ae66e676f9565fc46 (diff)
downloadgtest-050a520ddf9a34b93a3b41704fa2450d7450783f.tar.gz
gtest-050a520ddf9a34b93a3b41704fa2450d7450783f.tar.bz2
gtest-050a520ddf9a34b93a3b41704fa2450d7450783f.tar.xz
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).
git-svn-id: http://googletest.googlecode.com/svn/trunk@376 861a406c-534a-0410-8894-cb66d6ee9925
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 fb5bae9..3306f3f 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;