diff options
author | Abseil Team <absl-team@google.com> | 2018-11-15 20:43:19 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-11-20 18:29:12 (GMT) |
commit | aac18185ebb4c88d6df5dd4a40d553abf6b9792d (patch) | |
tree | 54be8bf5405dfdaddf29db24821bbbf205ed10d1 /googlemock/include/gmock/gmock-more-actions.h | |
parent | e46e87bb1f76b17fb50fc98065aa45e2207b94dc (diff) | |
download | googletest-aac18185ebb4c88d6df5dd4a40d553abf6b9792d.zip googletest-aac18185ebb4c88d6df5dd4a40d553abf6b9792d.tar.gz googletest-aac18185ebb4c88d6df5dd4a40d553abf6b9792d.tar.bz2 |
Googletest export
Upgrade WithArgs family of actions to C++11.
PiperOrigin-RevId: 221671690
Diffstat (limited to 'googlemock/include/gmock/gmock-more-actions.h')
-rw-r--r-- | googlemock/include/gmock/gmock-more-actions.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/googlemock/include/gmock/gmock-more-actions.h b/googlemock/include/gmock/gmock-more-actions.h index 5c6dc8b..1098408 100644 --- a/googlemock/include/gmock/gmock-more-actions.h +++ b/googlemock/include/gmock/gmock-more-actions.h @@ -127,27 +127,6 @@ PolymorphicAction<internal::InvokeMethodAction<Class, MethodPtr> > Invoke( internal::InvokeMethodAction<Class, MethodPtr>(obj_ptr, method_ptr)); } -// WithoutArgs(inner_action) can be used in a mock function with a -// non-empty argument list to perform inner_action, which takes no -// argument. In other words, it adapts an action accepting no -// argument to one that accepts (and ignores) arguments. -template <typename InnerAction> -inline internal::WithArgsAction<InnerAction> -WithoutArgs(const InnerAction& action) { - return internal::WithArgsAction<InnerAction>(action); -} - -// WithArg<k>(an_action) creates an action that passes the k-th -// (0-based) argument of the mock function to an_action and performs -// it. It adapts an action accepting one argument to one that accepts -// multiple arguments. For convenience, we also provide -// WithArgs<k>(an_action) (defined below) as a synonym. -template <int k, typename InnerAction> -inline internal::WithArgsAction<InnerAction, k> -WithArg(const InnerAction& action) { - return internal::WithArgsAction<InnerAction, k>(action); -} - // The ACTION*() macros trigger warning C4100 (unreferenced formal // parameter) in MSVC with -W4. Unfortunately they cannot be fixed in // the macro definition, as the warnings are generated when the macro |