From d152cd92de90166daf6b80d3e75367ae5247990d Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Thu, 13 Mar 2014 16:32:55 +0100 Subject: fix compilation with ocaml < 4 --- toplevel/stm.ml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/toplevel/stm.ml b/toplevel/stm.ml index 77e8bba2d8..1f127b4a06 100644 --- a/toplevel/stm.ml +++ b/toplevel/stm.ml @@ -1012,11 +1012,11 @@ end = struct (* {{{ *) | KillRespawn -> Pp.feedback (Interface.InProgress ~-1); Worker.kill proc; ignore(Worker.wait proc); - manage_slave cancel_user_req id_slave respawn + manage_slave ~cancel:cancel_user_req id_slave respawn | Sys_error _ | Invalid_argument _ | End_of_file when !task_expired -> Pp.feedback (Interface.InProgress ~-1); ignore(Worker.wait proc); - manage_slave cancel_user_req id_slave respawn + manage_slave ~cancel:cancel_user_req id_slave respawn | Sys_error _ | Invalid_argument _ | End_of_file when !task_cancelled -> msg_warning(strbrk "The worker was cancelled."); Option.iter (fun task -> @@ -1028,7 +1028,7 @@ end = struct (* {{{ *) Pp.feedback (Interface.InProgress ~-1); ) !last_task; Worker.kill proc; ignore(Worker.wait proc); - manage_slave cancel_user_req id_slave respawn + manage_slave ~cancel:cancel_user_req id_slave respawn | Sys_error _ | Invalid_argument _ | End_of_file when !fallback_to_lazy_if_slave_dies -> msg_warning(strbrk "The worker process died badly."); @@ -1039,7 +1039,7 @@ end = struct (* {{{ *) Pp.feedback (Interface.InProgress ~-1); ) !last_task; Worker.kill proc; ignore(Worker.wait proc); - manage_slave cancel_user_req id_slave respawn + manage_slave ~cancel:cancel_user_req id_slave respawn | Sys_error _ | Invalid_argument _ | End_of_file -> Worker.kill proc; let exit_status proc = match Worker.wait proc with -- cgit v1.2.3