diff options
| author | David Sunderland <sunderland@google.com> | 2018-04-19 00:25:31 (GMT) |
|---|---|---|
| committer | David Sunderland <sunderland@google.com> | 2018-04-19 00:25:31 (GMT) |
| commit | d5725da96894fcb93c1c3e4b87ad45372707a26b (patch) | |
| tree | 898b70f60f8f2183caf807abfa9296c90f09b11c /googlemock | |
| parent | 7878b27dddee0a62a4ba658feae0c3cd1368e983 (diff) | |
| download | googletest-d5725da96894fcb93c1c3e4b87ad45372707a26b.zip googletest-d5725da96894fcb93c1c3e4b87ad45372707a26b.tar.gz googletest-d5725da96894fcb93c1c3e4b87ad45372707a26b.tar.bz2 | |
Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors.
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 2 | ||||
| -rw-r--r-- | googlemock/src/gmock-internal-utils.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index c43dac0..3e858e7 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -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. diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc index ce75a5f..77caf2b 100644 --- a/googlemock/src/gmock-internal-utils.cc +++ b/googlemock/src/gmock-internal-utils.cc @@ -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( |