Merge PR #6051: Fix FIXME: use OCaml 4.02 generative functors when available.

9 files changed, 8 insertions, 24 deletions

diff --git a/lib/cSig.mli b/lib/cSig.mli
index 151cfbdca5..6910cbbf03 100644
--- a/lib/cSig.mli
+++ b/lib/cSig.mli
@@ -48,8 +48,6 @@ end
 (** Redeclaration of OCaml set signature, to preserve compatibility. See OCaml
     documentation for more information. *)
 
-module type EmptyS = sig end
-
 module type MapS =
 sig
     type key
diff --git a/lib/dyn.ml b/lib/dyn.ml
index e9f9709cb6..83e673d2c0 100644
--- a/lib/dyn.ml
+++ b/lib/dyn.ml
@@ -62,7 +62,7 @@ sig
 
 end
 
-module Make(M : CSig.EmptyS) = struct
+module Make () = struct
 module Self : PreS = struct
 (* Dynamics, programmed with DANGER !!! *)
 
diff --git a/lib/dyn.mli b/lib/dyn.mli
index a2bbd95a78..e0e1a9d140 100644
--- a/lib/dyn.mli
+++ b/lib/dyn.mli
@@ -62,5 +62,4 @@ end
 
 end
 
-(** FIXME: use OCaml 4.02 generative functors when available *)
-module Make(M : CSig.EmptyS) : S
+module Make () : S
diff --git a/lib/exninfo.ml b/lib/exninfo.ml
index d049dc6cff..167d3d6dc8 100644
--- a/lib/exninfo.ml
+++ b/lib/exninfo.ml
@@ -10,7 +10,7 @@
     containing a pair composed of the distinguishing [token] and the backtrace
     information. We discriminate the token by pointer equality. *)
 
-module Store = Store.Make(struct end)
+module Store = Store.Make ()
 
 type 'a t = 'a Store.field
 
diff --git a/lib/genarg.ml b/lib/genarg.ml
index b78fe40373..a3bfb405c8 100644
--- a/lib/genarg.ml
+++ b/lib/genarg.ml
@@ -11,7 +11,7 @@ open Util
 
 module ArgT =
 struct
-  module DYN = Dyn.Make(struct end)
+  module DYN = Dyn.Make ()
   module Map = DYN.Map
   type ('a, 'b, 'c) tag = ('a * 'b * 'c) DYN.tag
   type any = Any : ('a, 'b, 'c) tag -> any
diff --git a/lib/spawn.ml b/lib/spawn.ml
index 0cf163e737..de31d87d0e 100644
--- a/lib/spawn.ml
+++ b/lib/spawn.ml
@@ -28,8 +28,6 @@ module type Control = sig
 
 end
 
-module type Empty = sig end
-
 module type MainLoopModel = sig
   type async_chan
   type condition
@@ -216,7 +214,7 @@ let rec wait p =
 
 end
 
-module Sync(T : Empty) = struct
+module Sync () = struct
 
 type process = {
   cin  : in_channel;
diff --git a/lib/spawn.mli b/lib/spawn.mli
index a131715e9d..fd2b92ae3e 100644
--- a/lib/spawn.mli
+++ b/lib/spawn.mli
@@ -34,8 +34,6 @@ module type Control = sig
 end
 
 (* Abstraction to work with both threads and main loop models *)
-module type Empty = sig end
-
 module type MainLoopModel = sig
   type async_chan
   type condition
@@ -64,7 +62,7 @@ module Async(ML : MainLoopModel) : sig
 end
 
 (* spawn a process and read its output synchronously *)
-module Sync(T : Empty) : sig
+module Sync () : sig
   type process
   
   val spawn :
diff --git a/lib/store.ml b/lib/store.ml
index a1788f7da9..97a8fea085 100644
--- a/lib/store.ml
+++ b/lib/store.ml
@@ -14,10 +14,6 @@
     stores, we might want something static to avoid troubles with
     plugins order. *)
 
-module type T =
-sig
-end
-
 module type S =
 sig
   type t
@@ -30,7 +26,7 @@ sig
   val field : unit -> 'a field
 end
 
-module Make (M : T) : S =
+module Make () : S =
 struct
 
   let next =
diff --git a/lib/store.mli b/lib/store.mli
index 8eab314ed7..5cc5bb8593 100644
--- a/lib/store.mli
+++ b/lib/store.mli
@@ -9,11 +9,6 @@
 (*** This module implements an "untyped store", in this particular case we
         see it as an extensible record whose fields are left unspecified. ***)
 
-module type T =
-sig
-(** FIXME: Waiting for first-class modules... *)
-end
-
 module type S =
 sig
   type t
@@ -42,5 +37,5 @@ sig
 
 end
 
-module Make (M : T) : S
+module Make () : S
 (** Create a new store type. *)