diff options
| author | Tom Lachecki <TLachecki@serif.com> | 2019-06-13 17:37:33 +0100 |
|---|---|---|
| committer | Tom Lachecki <TLachecki@serif.com> | 2019-06-13 17:37:33 +0100 |
| commit | d515158d9c015349a79cbdac75a3dfbd0142baae (patch) | |
| tree | 28345542f446676cbf9146d26ea0cf64d35d9815 /googlemock | |
| parent | af4c2cb098a35f4898c5089335c10ba4bd5a4fce (diff) | |
| download | googletest-d515158d9c015349a79cbdac75a3dfbd0142baae.tar.gz googletest-d515158d9c015349a79cbdac75a3dfbd0142baae.tar.bz2 googletest-d515158d9c015349a79cbdac75a3dfbd0142baae.zip | |
Fixed issue #2284 (Incompatibility with C++17)
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 4 |
1 files 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<int, std::string> { - result_type operator()(argument_type input) const { +struct Functor { + std::string operator()(int input) const { return IntToStringFunction(input); } }; |