aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src/gmock-internal-utils.cc
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-25 13:10:41 -0400
committerGennadiy Civil <misterg@google.com>2018-04-25 13:10:41 -0400
commitb539167cf0254f521b791e908f6d3a5ff3f30245 (patch)
treea0609a9dda7ebefb285bae6e6b0f5e1c577c1051 /googlemock/src/gmock-internal-utils.cc
parent1114a0202a3147c1ce548c9a2883ce29e80df9e3 (diff)
downloadgoogletest-b539167cf0254f521b791e908f6d3a5ff3f30245.tar.gz
googletest-b539167cf0254f521b791e908f6d3a5ff3f30245.tar.bz2
googletest-b539167cf0254f521b791e908f6d3a5ff3f30245.zip
merging,
Diffstat (limited to 'googlemock/src/gmock-internal-utils.cc')
-rw-r--r--googlemock/src/gmock-internal-utils.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc
index 3fca3f26..77caf2bc 100644
--- a/googlemock/src/gmock-internal-utils.cc
+++ b/googlemock/src/gmock-internal-utils.cc
@@ -188,6 +188,8 @@ GTEST_API_ void Log(LogSeverity severity, const std::string& message,
std::cout << ::std::flush;
}
+GTEST_API_ WithoutMatchers GetWithoutMatchers() { return WithoutMatchers(); }
+
GTEST_API_ void IllegalDoDefault(const char* file, int line) {
internal::Assert(
false, file, line,