diff options
| -rw-r--r-- | googlemock/docs/cheat_sheet.md | 2 | ||||
| -rw-r--r-- | googlemock/include/gmock/gmock-actions.h | 17 | ||||
| -rw-r--r-- | googlemock/test/gmock-generated-actions_test.cc | 9 |
3 files changed, 7 insertions, 21 deletions
diff --git a/googlemock/docs/cheat_sheet.md b/googlemock/docs/cheat_sheet.md index b47e00f..85620f7 100644 --- a/googlemock/docs/cheat_sheet.md +++ b/googlemock/docs/cheat_sheet.md @@ -616,7 +616,7 @@ composite action - trying to do so will result in a run-time error. <!-- mdformat off(no multiline tables) --> | | | | :----------------------------- | :------------------------------------------ | -| `DoAll(a1, a2, ..., an)` | Do all actions `a1` to `an` and return the result of `an` in each invocation. The first `n - 1` sub-actions must return void and will receive a readonly view of the arguments. | +| `DoAll(a1, a2, ..., an)` | Do all actions `a1` to `an` and return the result of `an` in each invocation. The first `n - 1` sub-actions must return void. | | `IgnoreResult(a)` | Perform action `a` and ignore its result. `a` must not return void. | | `WithArg<N>(a)` | Pass the `N`-th (0-based) argument of the mock function to action `a` and perform it. | | `WithArgs<N1, N2, ..., Nk>(a)` | Pass the selected (0-based) arguments of the mock function to action `a` and perform it. | diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h index 4f7c1dd..79054db 100644 --- a/googlemock/include/gmock/gmock-actions.h +++ b/googlemock/include/gmock/gmock-actions.h @@ -1032,13 +1032,8 @@ struct WithArgsAction { template <typename... Actions> struct DoAllAction { private: - template <typename T> - using NonFinalType = - typename std::conditional<std::is_scalar<T>::value, T, const T&>::type; - template <typename... Args, size_t... I> - std::vector<Action<void(NonFinalType<Args>...)>> Convert( - IndexSequence<I...>) const { + std::vector<Action<void(Args...)>> Convert(IndexSequence<I...>) const { return {std::get<I>(actions)...}; } @@ -1048,13 +1043,14 @@ struct DoAllAction { template <typename R, typename... Args> operator Action<R(Args...)>() const { // NOLINT struct Op { - std::vector<Action<void(NonFinalType<Args>...)>> converted; + std::vector<Action<void(Args...)>> converted; Action<R(Args...)> last; R operator()(Args... args) const { + auto tuple_args = std::forward_as_tuple(std::forward<Args>(args)...); for (auto& a : converted) { - a.Perform(std::forward_as_tuple(std::forward<Args>(args)...)); + a.Perform(tuple_args); } - return last.Perform(std::forward_as_tuple(std::forward<Args>(args)...)); + return last.Perform(tuple_args); } }; return Op{Convert<Args...>(MakeIndexSequence<sizeof...(Actions) - 1>()), @@ -1097,8 +1093,7 @@ struct DoAllAction { typedef internal::IgnoredValue Unused; // Creates an action that does actions a1, a2, ..., sequentially in -// each invocation. All but the last action will have a readonly view of the -// arguments. +// each invocation. template <typename... Action> internal::DoAllAction<typename std::decay<Action>::type...> DoAll( Action&&... action) { diff --git a/googlemock/test/gmock-generated-actions_test.cc b/googlemock/test/gmock-generated-actions_test.cc index 3ec83e2..ef39dff 100644 --- a/googlemock/test/gmock-generated-actions_test.cc +++ b/googlemock/test/gmock-generated-actions_test.cc @@ -422,15 +422,6 @@ TEST(DoAllTest, TenActions) { EXPECT_EQ('g', g); } -TEST(DoAllTest, MoveOnlyArgs) { - bool ran_first = false; - Action<int(std::unique_ptr<int>)> a = - DoAll(InvokeWithoutArgs([&] { ran_first = true; }), - [](std::unique_ptr<int> p) { return *p; }); - EXPECT_EQ(7, a.Perform(std::make_tuple(std::unique_ptr<int>(new int(7))))); - EXPECT_TRUE(ran_first); -} - // 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 |