eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds support for building Google Mock as a shared library (DLL).

Browse Source
This commit is contained in:
vladlosev 2011-05-20 00:38:55 +00:00
parent ee2f8caecc
commit 7e29bb7f7e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gtest/internal/gtest-internal.h
View File

@ -122,7 +122,7 @@ class TestInfoImpl; // Opaque implementation of TestInfo
class UnitTestImpl; // Opaque implementation of UnitTest class UnitTestImpl; // Opaque implementation of UnitTest
// How many times InitGoogleTest() has been called. // How many times InitGoogleTest() has been called.
extern int g_init_gtest_count; GTEST_API_ extern int g_init_gtest_count;
// The text used in failure messages to indicate the start of the // The text used in failure messages to indicate the start of the
// stack trace. // stack trace.

4
src/gtest.cc
View File

@ -305,7 +305,7 @@ UInt32 Random::Generate(UInt32 range) {
// Test. g_init_gtest_count is set to the number of times // Test. g_init_gtest_count is set to the number of times
// InitGoogleTest() has been called. We don't protect this variable // InitGoogleTest() has been called. We don't protect this variable
// under a mutex as it is only accessed in the main thread. // under a mutex as it is only accessed in the main thread.
int g_init_gtest_count = 0; GTEST_API_ int g_init_gtest_count = 0;
static bool GTestIsInitialized() { return g_init_gtest_count != 0; } static bool GTestIsInitialized() { return g_init_gtest_count != 0; }
// Iterates over a vector of TestCases, keeping a running sum of the // Iterates over a vector of TestCases, keeping a running sum of the
@ -360,7 +360,7 @@ void AssertHelper::operator=(const Message& message) const {
} }
// Mutex for linked pointers. // Mutex for linked pointers.
GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex); GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex);
// Application pathname gotten in InitGoogleTest. // Application pathname gotten in InitGoogleTest.
String g_executable_path; String g_executable_path;