# HG changeset patch
# User Matthias Goergens <matthias.goergens@xxxxxxxxxx>
# Date 1272293888 -3600
# Node ID 15ed6cf7e5179f99db4c65f8ba6b08ede2c14800
# Parent  9e074f2951ddadc5451b06a75ea84b13444447c6
in stdext/Opt: Renamed cat_options to cat_some, to be more in line with the coming either module.

Signed-off-by: Matthias Goergens <Matthias.Goergens@xxxxxxxxxx>

diff -r 9e074f2951dd -r 15ed6cf7e517 stdext/opt.ml
--- a/stdext/opt.ml
+++ b/stdext/opt.ml
@@ -53,7 +53,7 @@
 	| Some x -> f x accu
 	| None -> accu
 
-let cat_options a = List.map unbox (List.filter is_boxed a)
+let cat_some a = List.map unbox (List.filter is_boxed a)
 
 let join = function
     | Some (Some a) -> Some a
diff -r 9e074f2951dd -r 15ed6cf7e517 stdext/opt.mli
--- a/stdext/opt.mli
+++ b/stdext/opt.mli
@@ -19,5 +19,5 @@
 val to_list : 'a option -> 'a list
 val fold_left : ('a -> 'b -> 'a) -> 'a -> 'b option -> 'a
 val fold_right : ('a -> 'b -> 'b) -> 'a option -> 'b -> 'b
-val cat_options : 'a option list -> 'a list
+val cat_some : 'a option list -> 'a list
 val join : ('a option) option -> 'a option