diff options
author | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-05-20 00:42:22 +0000 |
---|---|---|
committer | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-05-20 00:42:22 +0000 |
commit | 587c1b37c2f0b6d430fb13ce09326db0135b557c (patch) | |
tree | 9396b2a9b8eb5d3c30beb9001e983bba37bc7774 /src/gmock-spec-builders.cc | |
parent | 47be72a952e672e2635c62353d25e611e9a70dac (diff) | |
download | googletest-587c1b37c2f0b6d430fb13ce09326db0135b557c.tar.gz googletest-587c1b37c2f0b6d430fb13ce09326db0135b557c.tar.bz2 googletest-587c1b37c2f0b6d430fb13ce09326db0135b557c.zip |
Adds support for building Google Mock as a shared library (DLL).
Diffstat (limited to 'src/gmock-spec-builders.cc')
-rw-r--r-- | src/gmock-spec-builders.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gmock-spec-builders.cc b/src/gmock-spec-builders.cc index aa33cc44..c192f96c 100644 --- a/src/gmock-spec-builders.cc +++ b/src/gmock-spec-builders.cc @@ -53,12 +53,12 @@ namespace internal { // Protects the mock object registry (in class Mock), all function // mockers, and all expectations. -GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex); +GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex); // Logs a message including file and line number information. -void LogWithLocation(testing::internal::LogSeverity severity, - const char* file, int line, - const string& message) { +GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity, + const char* file, int line, + const string& message) { ::std::ostringstream s; s << file << ":" << line << ": " << message << ::std::endl; Log(severity, s.str(), 0); @@ -240,7 +240,7 @@ void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) { // Points to the implicit sequence introduced by a living InSequence // object (if any) in the current thread or NULL. -ThreadLocal<Sequence*> g_gmock_implicit_sequence; +GTEST_API_ ThreadLocal<Sequence*> g_gmock_implicit_sequence; // Reports an uninteresting call (whose description is in msg) in the // manner specified by 'reaction'. |