From 9f07d976c4d91a52c24fe27dbe66064b601ece39 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Mon, 29 Jun 2015 10:21:42 +0200
Subject: [PATCH] fix `-safe-string` issues

---
 src/advanced/CCMonadIO.cppo.ml | 8 +++-----
 src/advanced/CCMonadIO.mli     | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/advanced/CCMonadIO.cppo.ml b/src/advanced/CCMonadIO.cppo.ml
index fe081527..b4658b15 100644
--- a/src/advanced/CCMonadIO.cppo.ml
+++ b/src/advanced/CCMonadIO.cppo.ml
@@ -204,11 +204,6 @@ let with_out ?(mode=0o644) ?(flags=[]) filename =
 let with_out_a ?mode ?(flags=[]) filename =
   with_out ?mode ~flags:(Open_creat::Open_append::flags) filename
 
-let _write oc s i len () = output oc s i len
-let write oc s i len = Wrap (_write oc s i len)
-
-                            
-
 #if OCAML_MAJOR >= 4 && OCAML_MINOR >= 2
 
 let output_str_ = Pervasives.output_substring
@@ -219,6 +214,9 @@ let output_str_ = Pervasives.output
 
 #endif
 
+let _write oc s i len () = output_str_ oc s i len
+let write oc s i len = Wrap (_write oc s i len)
+
 let _write_str oc s () = output_str_ oc s 0 (String.length s)
 let write_str oc s = Wrap (_write_str oc s)
 
diff --git a/src/advanced/CCMonadIO.mli b/src/advanced/CCMonadIO.mli
index 03c4216d..36ef97fb 100644
--- a/src/advanced/CCMonadIO.mli
+++ b/src/advanced/CCMonadIO.mli
@@ -145,7 +145,7 @@ val with_in : ?mode:int -> ?flags:open_flag list ->
     It yields a [in_channel] with a finalizer attached. See {!(>>>=)} to
     use it. *)
 
-val read : in_channel -> string -> int -> int -> int t
+val read : in_channel -> Bytes.t -> int -> int -> int t
 (** Read a chunk into the given string *)
 
 val read_line : in_channel -> string option t