summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Glondu <steph@glondu.net>2019-09-07 20:00:09 +0200
committerStéphane Glondu <glondu@debian.org>2019-09-08 11:39:18 +0200
commit6af90031447c29cf647cd26637f59694b0570337 (patch)
treeda54c56b7afa30dc54dbfb774a23bd489066aa6a
parent83999cacb63c333a124583386f675cf39a09692d (diff)
Fix compilation with OCaml 4.08.0
Gbp-Pq: Name 0008-Fix-compilation-with-OCaml-4.08.0.patch
-rw-r--r--OMakefile2
-rw-r--r--src/base/types.ml2
-rw-r--r--src/base/types.mli16
3 files changed, 10 insertions, 10 deletions
diff --git a/OMakefile b/OMakefile
index 4d15909..74c1f83 100644
--- a/OMakefile
+++ b/OMakefile
@@ -1,7 +1,7 @@
include config.omake
-OCAMLFLAGS += -dtypes -w +a-3-4-27-50-52-60-k
+OCAMLFLAGS += -dtypes -w +a-3-4-27-44-50-52-60-k
.SUBDIRS: src doc
diff --git a/src/base/types.ml b/src/base/types.ml
index 0fea396..c080c97 100644
--- a/src/base/types.ml
+++ b/src/base/types.ml
@@ -380,7 +380,7 @@ module String = struct
for i = 0 to (len-1) do
s.[i] <- Char.gen ~size:size rs
done;
- s
+ Bytes.to_string s
let to_string x = x
end
diff --git a/src/base/types.mli b/src/base/types.mli
index f5e661c..b20a0d2 100644
--- a/src/base/types.mli
+++ b/src/base/types.mli
@@ -360,7 +360,7 @@ sig
val big_int_of_nat : Nat.nat -> big_int
val base_power_big_int : int -> int -> big_int -> big_int
val sys_big_int_of_string : string -> int -> int -> big_int
- val round_futur_last_digit : string -> int -> int -> bool
+ val round_futur_last_digit : bytes -> int -> int -> bool
val approx_big_int : int -> big_int -> string
type t = big_int
val equal : big_int -> big_int -> bool
@@ -485,13 +485,13 @@ module String :
sig
external length : string -> int = "%string_length"
external get : string -> int -> char = "%string_safe_get"
- external set : string -> int -> char -> unit = "%string_safe_set"
- external create : int -> string = "caml_create_string"
+ external set : bytes -> int -> char -> unit = "%string_safe_set"
+ external create : int -> bytes = "caml_create_string"
val make : int -> char -> string
val copy : string -> string
val sub : string -> int -> int -> string
- val fill : string -> int -> int -> char -> unit
- val blit : string -> int -> string -> int -> int -> unit
+ val fill : bytes -> int -> int -> char -> unit
+ val blit : string -> int -> bytes -> int -> int -> unit
val concat : string -> string list -> string
val iter : (char -> unit) -> string -> unit
val escaped : string -> string
@@ -509,11 +509,11 @@ sig
type t = string
val compare : t -> t -> int
external unsafe_get : string -> int -> char = "%string_unsafe_get"
- external unsafe_set : string -> int -> char -> unit
+ external unsafe_set : bytes -> int -> char -> unit
= "%string_unsafe_set"
- external unsafe_blit : string -> int -> string -> int -> int -> unit
+ external unsafe_blit : string -> int -> bytes -> int -> int -> unit
= "caml_blit_string" "noalloc"
- external unsafe_fill : string -> int -> int -> char -> unit
+ external unsafe_fill : bytes -> int -> int -> char -> unit
= "caml_fill_string" "noalloc"
val equal : t -> t -> bool
val hash : 'a -> int