Merge pull request #1150 from uklotzde/gmock_patch

Patch gmock-1.7.0 to avoid segfaults with GCC 6 during tests
mixxxdj · Jan 26, 2017 · 62b0d47 · 62b0d47
2 parents ec2d342 + 9c14b70
commit 62b0d47
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/gmock-1.7.0/include/gmock/gmock-spec-builders.h b/lib/gmock-1.7.0/include/gmock/gmock-spec-builders.h
@@ -1381,7 +1381,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.
@@ -1390,7 +1390,7 @@ class ActionResultHolder<void> : public UntypedActionResultHolderBase {
       const Action<F>& action,
       const typename Function<F>::ArgumentTuple& args) {
     action.Perform(args);
-    return NULL;
+    return new ActionResultHolder();
   }
 };