diff options
| author |  Samuel Mimram <smimram@debian.org> | 2006-11-21 21:38:49 +0000 |
|---|---|---|
| committer | Samuel Mimram <smimram@debian.org> | 2006-11-21 21:38:49 +0000 |
| commit | 208a0f7bfa5249f9795e6e225f309cbe715c0fad (patch) | |
| tree | 591e9e512063e34099782e2518573f15ffeac003 /kernel/mod_typing.ml | |
| parent | de0085539583f59dc7c4bf4e272e18711d565466 (diff) | |
Imported Upstream version 8.1~gammaupstream/8.1.gamma
Diffstat (limited to 'kernel/mod_typing.ml')
| -rw-r--r-- | kernel/mod_typing.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/mod_typing.ml b/kernel/mod_typing.ml index a8aff184..663434ec 100644 --- a/kernel/mod_typing.ml +++ b/kernel/mod_typing.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id: mod_typing.ml 7639 2005-12-02 10:01:15Z gregoire $ i*) +(*i $Id: mod_typing.ml 9310 2006-10-28 19:35:09Z herbelin $ i*) open Util open Names @@ -87,8 +87,8 @@ and merge_with env mtb with_decl = match cb.const_body with | None -> let (j,cst1) = Typeops.infer env' c in - let cst2 = - Reduction.conv_leq env' j.uj_type cb.const_type in + let typ = Typeops.type_of_constant_type env' cb.const_type in + let cst2 = Reduction.conv_leq env' j.uj_type typ in let cst = Constraint.union (Constraint.union cb.const_constraints cst1) |