From d515158d9c015349a79cbdac75a3dfbd0142baae Mon Sep 17 00:00:00 2001 From: Tom Lachecki Date: Thu, 13 Jun 2019 17:37:33 +0100 Subject: [PATCH] Fixed issue #2284 (Incompatibility with C++17) --- googlemock/test/gmock-matchers_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index eb0a0506..89ad3359 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -4266,8 +4266,8 @@ TEST(ResultOfTest, WorksForFunctionReferences) { // Tests that ResultOf(f, ...) compiles and works as expected when f is a // function object. -struct Functor : public ::std::unary_function { - result_type operator()(argument_type input) const { +struct Functor { + std::string operator()(int input) const { return IntToStringFunction(input); } };