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

PiperOrigin-RevId: 253067038

Merge pull request #2285 from tomalakgeretkal:c++17-fix
PiperOrigin-RevId: 253067038
84a498de · Gennadiy Civil · 26afdba7 · d515158d · 84a498de
Commit 84a498de authored Jun 13, 2019 by Gennadiy Civil
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

googlemock/test/gmock-matchers_test.cc googlemock/test/gmock-matchers_test.cc +2 -2

No files found.
--- 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> {
+struct Functor {
-  result_type operator()(argument_type input) const {
+  std::string operator()(int input) const {
    return IntToStringFunction(input);
  }
 };