From: Andrea Berlingieri <andrea.berlingieri42@gmail.com>
Date: Fri, 27 Sep 2019 13:40:44 +0000 (+0200)
Subject: Change Sort.merge (deprecated) with List.merge
X-Git-Tag: make_still_working~229^2~1^2~1^2
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=4112b9f87a555bfc4c3cd06bae652cd2382cad8b;p=helm.git

Change Sort.merge (deprecated) with List.merge
---

diff --git a/matita/components/ng_extraction/mlutil.ml b/matita/components/ng_extraction/mlutil.ml
index 0d5e89f6e..52881e183 100644
--- a/matita/components/ng_extraction/mlutil.ml
+++ b/matita/components/ng_extraction/mlutil.ml
@@ -1242,7 +1242,7 @@ let rec non_stricts add cand = function
 	   let n = List.length i in
 	   let cand = lift n cand in
 	   let cand = pop n (non_stricts add cand t) in
-	   Sort.merge (<=) cand c) [] v
+       List.merge (fun c1 c2 -> c1 - c2) cand c) [] v
 	(* [merge] may duplicates some indices, but I don't mind. *)
   | MLmagic t ->
       non_stricts add cand t