summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-06-14 13:38:34 (GMT)
committerGennadiy Civil <misterg@google.com>2019-06-14 13:38:34 (GMT)
commit41961e9e0586cc3bf200dbc3c3f7e6b5e651d27b (patch)
tree3b5b440681a4718f126c3e0ca3c7ee2adc8e9cf6 /googlemock
parent38d967e889eb4e68c8e43e7eb23c9ab6832700ed (diff)
parentf7c178ecb33c92763fa41d4999db30aaf43a6b30 (diff)
downloadgoogletest-41961e9e0586cc3bf200dbc3c3f7e6b5e651d27b.zip
googletest-41961e9e0586cc3bf200dbc3c3f7e6b5e651d27b.tar.gz
googletest-41961e9e0586cc3bf200dbc3c3f7e6b5e651d27b.tar.bz2
Merge branch 'master' of https://github.com/google/googletestrefs/pull/2286/head
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-matchers_test.cc4
1 files changed, 2 insertions, 2 deletions
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 @@ 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);
}
};