merge changes from branch 4.02 from branching (rev 14852) to 4.02.0+rc1 (rev 15121)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15125 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 3 insertions, 0 deletions

diff --git a/stdlib/sort.mli b/stdlib/sort.mli
index d5abb79fa8..a9be27e138 100644
--- a/stdlib/sort.mli
+++ b/stdlib/sort.mli
@@ -20,11 +20,13 @@
 *)
 
 val list : ('a -> 'a -> bool) -> 'a list -> 'a list
+  [@@ocaml.deprecated]
 (** Sort a list in increasing order according to an ordering predicate.
    The predicate should return [true] if its first argument is
    less than or equal to its second argument. *)
 
 val array : ('a -> 'a -> bool) -> 'a array -> unit
+  [@@ocaml.deprecated]
 (** Sort an array in increasing order according to an
    ordering predicate.
    The predicate should return [true] if its first argument is
@@ -32,6 +34,7 @@ val array : ('a -> 'a -> bool) -> 'a array -> unit
    The array is sorted in place. *)
 
 val merge : ('a -> 'a -> bool) -> 'a list -> 'a list -> 'a list
+  [@@ocaml.deprecated]
 (** Merge two lists according to the given predicate.
    Assuming the two argument lists are sorted according to the
    predicate, [merge] returns a sorted list containing the elements