summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-10-24 23:36:46 (GMT)
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-10-24 23:36:46 (GMT)
commit83fe024fb0fefcd7069d5d4c0611eca6bf66bd1f (patch)
tree55b7fdf44c13ab0ab1652869fbaa6ba50631c04d /include
parent4c11f25f8c972bc5bed6d92abe2a0a3e41f499d7 (diff)
downloadgoogletest-83fe024fb0fefcd7069d5d4c0611eca6bf66bd1f.zip
googletest-83fe024fb0fefcd7069d5d4c0611eca6bf66bd1f.tar.gz
googletest-83fe024fb0fefcd7069d5d4c0611eca6bf66bd1f.tar.bz2
Adds empty methods to Mutex on platforms where Google Test is not thread-safe. This will support a reentrancy fix in Google Mock.
Diffstat (limited to 'include')
-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 {}
};