commit 84a498decceb171d38bb5cf71d7e264431709238
author Gennadiy Civil <misterg@google.com> Thu Jun 13 14:13:37 2019 -0400
committer Gennadiy Civil <misterg@google.com> Thu Jun 13 14:13:37 2019 -0400
tree 3c367d2f6bdd7ad2fb40a02cbd73d2c523930327
parent 26afdba792e52cac00ce11644c3c0b1789c40bf7
parent d515158d9c015349a79cbdac75a3dfbd0142baae

Merge pull request #2285 from tomalakgeretkal:c++17-fix

PiperOrigin-RevId: 253067038

googlemock/test/gmock-matchers_test.cc

diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index eb0a050..89ad335 100644
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@ -4266,8 +4266,8 @@
 
 // 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);
   }
 };