Commits

Markus Mottl committed c18c19d

Removed fixes for a buggy warning

Comments (0)

Files changed (2)

 # HG changeset patch
-# Parent 781119def8fd6e4f51bb1f00ca00b061d86bf423
-Fixes for OCaml 4.00
+# Parent 8808e3a2571f4c5566957767c1049dba47a71dc9
+Removed fixes for a buggy warning
 
 diff --git a/base/bin_prot/lib/read_c.ml b/base/bin_prot/lib/read_c.ml
 --- a/base/bin_prot/lib/read_c.ml
  open Common
  open Read_ml
  open Write_ml
-@@ -77,7 +76,7 @@
- 
-   type t = S.t
- 
--  let bin_size_t t = B.bin_size_t (S.to_binable t)
-+  let bin_size_t (t : t) = B.bin_size_t (S.to_binable t)
-   let bin_write_t buf ~pos t = B.bin_write_t buf ~pos (S.to_binable t)
-   let bin_write_t_ sptr eptr t = B.bin_write_t_ sptr eptr (S.to_binable t)
-   let bin_read_t buf ~pos_ref = S.of_binable (B.bin_read_t buf ~pos_ref)
-@@ -123,7 +122,7 @@
- 
-   let bin_size_t bin_size_el t = B.bin_size_t bin_size_el (S.to_binable t)
- 
--  let bin_write_t bin_write_el buf ~pos t =
-+  let bin_write_t bin_write_el buf ~pos (t : 'a t) =
-     B.bin_write_t bin_write_el buf ~pos (S.to_binable t)
- 
-   let bin_write_t_ bin_write_el sptr eptr t =
-@@ -179,7 +178,7 @@
- 
-   type ('a, 'b) t = ('a, 'b) S.t
- 
--  let bin_size_t bin_size_el1 bin_size_el2 t =
-+  let bin_size_t bin_size_el1 bin_size_el2 (t : ('a, 'b) t) =
-     B.bin_size_t bin_size_el1 bin_size_el2 (S.to_binable t)
- 
-   let bin_write_t bin_write_el1 bin_write_el2 buf ~pos t =
-@@ -257,7 +256,7 @@
-           let msg = Printf.sprintf "%s.%s" module_name msg in
-           raise_concurrent_modification msg)
- 
--  let bin_size_t t =
-+  let bin_size_t (t : t) =
-     let size_ref = ref 0 in
-     let cnt_ref = ref 0 in
-     iter t ~f:(fun el ->
 @@ -314,13 +313,6 @@
        unsafe_write = bin_write_t_;
      }
    let bin_reader_t =
      {
        read = bin_read_t;
-@@ -364,7 +356,7 @@
-           let msg = Printf.sprintf "%s.%s" module_name msg in
-           raise_concurrent_modification msg)
- 
--  let bin_size_t bin_size_a t =
-+  let bin_size_t bin_size_a (t : 'a t) =
-     let size_ref = ref 0 in
-     let cnt_ref = ref 0 in
-     iter t ~f:(fun el ->
 @@ -423,15 +415,6 @@
          bin_write_t_ bin_writer.unsafe_write sptr eptr v);
      }
    let bin_reader_t bin_reader =
      {
        read = (fun buf ~pos_ref ->
-@@ -477,7 +460,7 @@
-           let msg = Printf.sprintf "%s.%s" module_name msg in
-           raise_concurrent_modification msg)
- 
--  let bin_size_t bin_size_a bin_size_b t =
-+  let bin_size_t bin_size_a bin_size_b (t : ('a, 'b) t) =
-     let size_ref = ref 0 in
-     let cnt_ref = ref 0 in
-     iter t ~f:(fun el ->
 @@ -536,17 +519,6 @@
          bin_write_t
            bin_writer1.unsafe_write bin_writer2.unsafe_write buf ~pos v);
+ocaml-4.00-fixes
 improved-string-printing
 unix-cleanups
-ocaml-4.00-fixes
 # Placed by Bitbucket
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.