aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-03-30 14:26:22 -0400
committerAndy Getz <durandal@google.com>2020-03-31 19:23:38 -0400
commit61f010d703b32de9bfb20ab90ece38ab2f25977f (patch)
tree46e3d4a1e5f1611128c367fe03fa7b27928d01bf /googlemock
parentdc82a33473dd98ceaaa90173788628329b8bfbdb (diff)
downloadgoogletest-61f010d703b32de9bfb20ab90ece38ab2f25977f.tar.gz
googletest-61f010d703b32de9bfb20ab90ece38ab2f25977f.tar.bz2
googletest-61f010d703b32de9bfb20ab90ece38ab2f25977f.zip
Googletest export
Do not use std::result_of as it was removed in C++20. PiperOrigin-RevId: 303783600
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/include/gmock/gmock-actions.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h
index b4127e93..615651b3 100644
--- a/googlemock/include/gmock/gmock-actions.h
+++ b/googlemock/include/gmock/gmock-actions.h
@@ -970,7 +970,8 @@ struct InvokeMethodWithoutArgsAction {
Class* const obj_ptr;
const MethodPtr method_ptr;
- using ReturnType = typename std::result_of<MethodPtr(Class*)>::type;
+ using ReturnType =
+ decltype((std::declval<Class*>()->*std::declval<MethodPtr>())());
template <typename... Args>
ReturnType operator()(const Args&...) const {