Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
7e29bb7f
Commit
7e29bb7f
authored
May 20, 2011
by
vladlosev
Browse files
Adds support for building Google Mock as a shared library (DLL).
parent
ee2f8cae
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
include/gtest/internal/gtest-internal.h
include/gtest/internal/gtest-internal.h
+1
-1
src/gtest.cc
src/gtest.cc
+2
-2
No files found.
include/gtest/internal/gtest-internal.h
View file @
7e29bb7f
...
@@ -122,7 +122,7 @@ class TestInfoImpl; // Opaque implementation of TestInfo
...
@@ -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.
...
...
src/gtest.cc
View file @
7e29bb7f
...
@@ -305,7 +305,7 @@ UInt32 Random::Generate(UInt32 range) {
...
@@ -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 {
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment