Skip to content

G
googletest
Commit d5725da9 by David Sunderland
Options

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

parent 7878b27d
Showing with 2 additions and 2 deletions
googlemock/include/gmock/internal/gmock-internal-utils.h
...@@ -357,7 +357,7 @@ class WithoutMatchers { ...@@ -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.
......
googlemock/src/gmock-internal-utils.cc
...@@ -188,7 +188,7 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message, ...@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment