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

Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors.

Browse Source
This commit is contained in:
David Sunderland 2018-04-18 20:25:31 -04:00
parent 7878b27ddd
commit d5725da968
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/internal/gmock-internal-utils.h
View File

@ -357,7 +357,7 @@ class WithoutMatchers {
}; };
// Internal use only: access the singleton instance of 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. // TODO(wan@google.com): group all type utilities together.

2
googlemock/src/gmock-internal-utils.cc
View File

@ -188,7 +188,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message,
std::cout << ::std::flush; std::cout << ::std::flush;
} }
WithoutMatchers GetWithoutMatchers() { return WithoutMatchers(); } GTEST_API_ WithoutMatchers GetWithoutMatchers() { return WithoutMatchers(); }
GTEST_API_ void IllegalDoDefault(const char* file, int line) { GTEST_API_ void IllegalDoDefault(const char* file, int line) {
internal::Assert( internal::Assert(