aboutsummaryrefslogtreecommitdiffhomepage
path: root/stm/workerPool.ml
diff options
context:
space:
mode:
authorGravatar Enrico Tassi <Enrico.Tassi@inria.fr>2014-12-11 14:27:46 +0100
committerGravatar Enrico Tassi <Enrico.Tassi@inria.fr>2014-12-17 15:05:04 +0100
commit2d66c7d508f6bd198969012241082e34a5b6047c (patch)
tree33b632f3118c8166a05211aa5a05375268fb78a3 /stm/workerPool.ml
parent433f0bc4e5110db09c770022b277c419f8b35f64 (diff)
CThread: use a different type for thread friendly in_channels
Diffstat (limited to 'stm/workerPool.ml')
-rw-r--r--stm/workerPool.ml2
1 files changed, 1 insertions, 1 deletions
diff --git a/stm/workerPool.ml b/stm/workerPool.ml
index 65fb755be..510611f05 100644
--- a/stm/workerPool.ml
+++ b/stm/workerPool.ml
@@ -65,7 +65,7 @@ let master_handshake worker_id ic oc =
let worker_handshake slave_ic slave_oc =
try
- let v = (Marshal.from_channel slave_ic : int) in
+ let v = (CThread.thread_friendly_input_value slave_ic : int) in
if v <> magic_no then begin
prerr_endline "Handshake failed: protocol mismatch\n";
exit 1;