diff options
| author | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-06-07 23:28:17 (GMT) |
|---|---|---|
| committer | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-10-25 13:04:01 (GMT) |
| commit | 840c711e7bd7240b3f451821473c759ad3578412 (patch) | |
| tree | e8b98c51ad7fb8f9c55e6ca0f1c14f20a1567c45 /googlemock/test | |
| parent | 2641b021fc2ab12896cf868d90f19936ef4b4696 (diff) | |
| download | googletest-840c711e7bd7240b3f451821473c759ad3578412.zip googletest-840c711e7bd7240b3f451821473c759ad3578412.tar.gz googletest-840c711e7bd7240b3f451821473c759ad3578412.tar.bz2 | |
Fix gmock tests when std::unary_function unavailablerefs/pull/1218/head
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 207c6fd..4beaec4 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -3936,8 +3936,11 @@ 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 { + typedef std::string result_type; + typedef int argument_type; + + std::string operator()(int input) const { return IntToStringFunction(input); } }; |