Merge branch 'master' of https://github.com/google/googletest
This commit is contained in:
commit
41961e9e05
|
@ -4266,8 +4266,8 @@ TEST(ResultOfTest, WorksForFunctionReferences) {
|
||||||
|
|
||||||
// Tests that ResultOf(f, ...) compiles and works as expected when f is a
|
// Tests that ResultOf(f, ...) compiles and works as expected when f is a
|
||||||
// function object.
|
// 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);
|
return IntToStringFunction(input);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user