summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-10-24 23:36:46 +0000
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-10-24 23:36:46 +0000
commit9781f5467fadad9b15a0beb983b123049dc6d5a2 (patch)
tree55b7fdf44c13ab0ab1652869fbaa6ba50631c04d
parentee89af8d5f0578d9da31c5295f59f2d2bdebec39 (diff)
downloadgtest-9781f5467fadad9b15a0beb983b123049dc6d5a2.tar.gz
gtest-9781f5467fadad9b15a0beb983b123049dc6d5a2.tar.bz2
gtest-9781f5467fadad9b15a0beb983b123049dc6d5a2.tar.xz
Adds empty methods to Mutex on platforms where Google Test is not thread-safe. This will support a reentrancy fix in Google Mock.
git-svn-id: http://googletest.googlecode.com/svn/trunk@605 861a406c-534a-0410-8894-cb66d6ee9925
-rw-r--r--include/gtest/internal/gtest-port.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index cb870c9..0493892 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -1416,6 +1416,8 @@ class ThreadLocal {
class Mutex {
public:
Mutex() {}
+ void Lock() {}
+ void Unlock() {}
void AssertHeld() const {}
};