diff options
| author | Pierre Weis <Pierre.Weis@inria.fr> | 2007-10-09 10:29:37 +0000 |
|---|---|---|
| committer | Pierre Weis <Pierre.Weis@inria.fr> | 2007-10-09 10:29:37 +0000 |
| commit | 59e0723455fc8b847a1303bfc73db5968d666eee (patch) | |
| tree | 29b21992d5428948131f66b950ec4e8ed48f0166 /ocamldoc/odoc_merge.ml | |
| parent | 00f4865bad9838add05d832a05b19fb68da47043 (diff) | |
It works: compilers and camlp4 are fully bootstrapped. The ast magic number is not yet changed.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8418 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_merge.ml')
| -rw-r--r-- | ocamldoc/odoc_merge.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ocamldoc/odoc_merge.ml b/ocamldoc/odoc_merge.ml index 468c47113..fd046752e 100644 --- a/ocamldoc/odoc_merge.ml +++ b/ocamldoc/odoc_merge.ml @@ -196,7 +196,7 @@ let merge_types merge_options mli ml = Type_abstract, _ -> () - | Type_variant (l1, _), Type_variant (l2, _) -> + | Type_variant l1, Type_variant l2 -> let f cons = try let cons2 = List.find @@ -224,7 +224,7 @@ let merge_types merge_options mli ml = in List.iter f l1 - | Type_record (l1, _), Type_record (l2, _) -> + | Type_record l1, Type_record l2 -> let f record = try let record2= List.find |