diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-06-13 14:13:37 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-06-13 14:13:37 -0400 |
| commit | 84a498decceb171d38bb5cf71d7e264431709238 (patch) | |
| tree | 3c367d2f6bdd7ad2fb40a02cbd73d2c523930327 | |
| parent | 26afdba792e52cac00ce11644c3c0b1789c40bf7 (diff) | |
| parent | d515158d9c015349a79cbdac75a3dfbd0142baae (diff) | |
| download | googletest-84a498decceb171d38bb5cf71d7e264431709238.tar.gz googletest-84a498decceb171d38bb5cf71d7e264431709238.tar.bz2 googletest-84a498decceb171d38bb5cf71d7e264431709238.zip | |
Merge pull request #2285 from tomalakgeretkal:c++17-fix
PiperOrigin-RevId: 253067038
| -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); } }; |