|
@@ -9930,6 +9930,8 @@ class ActionResultHolder : public UntypedActionResultHolderBase {
|
|
|
template <>
|
|
|
class ActionResultHolder<void> : public UntypedActionResultHolderBase {
|
|
|
public:
|
|
|
+ explicit ActionResultHolder() {}
|
|
|
+
|
|
|
void GetValueAndDelete() const { delete this; }
|
|
|
|
|
|
virtual void PrintAsActionResult(::std::ostream* /* os */) const {}
|
|
@@ -9941,7 +9943,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
|
|
|
const typename Function<F>::ArgumentTuple& args,
|
|
|
const string& call_description) {
|
|
|
func_mocker->PerformDefaultAction(args, call_description);
|
|
|
- return NULL;
|
|
|
+ return new ActionResultHolder();
|
|
|
}
|
|
|
|
|
|
// Performs the given action and returns NULL.
|
|
@@ -9950,7 +9952,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
|
|
|
const Action<F>& action,
|
|
|
const typename Function<F>::ArgumentTuple& args) {
|
|
|
action.Perform(args);
|
|
|
- return NULL;
|
|
|
+ return new ActionResultHolder();
|
|
|
}
|
|
|
};
|
|
|
|