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
d5725da9
Commit
d5725da9
authored
Apr 18, 2018
by
David Sunderland
Browse files
Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors.
parent
7878b27d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
googlemock/include/gmock/internal/gmock-internal-utils.h
googlemock/include/gmock/internal/gmock-internal-utils.h
+1
-1
googlemock/src/gmock-internal-utils.cc
googlemock/src/gmock-internal-utils.cc
+1
-1
No files found.
googlemock/include/gmock/internal/gmock-internal-utils.h
View file @
d5725da9
...
...
@@ -357,7 +357,7 @@ class WithoutMatchers {
};
// Internal use only: access the singleton instance of WithoutMatchers.
WithoutMatchers
GetWithoutMatchers
();
GTEST_API_
WithoutMatchers
GetWithoutMatchers
();
// TODO(wan@google.com): group all type utilities together.
...
...
googlemock/src/gmock-internal-utils.cc
View file @
d5725da9
...
...
@@ -188,7 +188,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message,
std
::
cout
<<
::
std
::
flush
;
}
WithoutMatchers
GetWithoutMatchers
()
{
return
WithoutMatchers
();
}
GTEST_API_
WithoutMatchers
GetWithoutMatchers
()
{
return
WithoutMatchers
();
}
GTEST_API_
void
IllegalDoDefault
(
const
char
*
file
,
int
line
)
{
internal
::
Assert
(
...
...
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