diff options
author | 2009-07-04 13:28:38 +0200 | |
---|---|---|
committer | 2009-07-04 13:28:38 +0200 | |
commit | 3a420f4ad929e8372d32c735fd0fd89dfc0346a1 (patch) | |
tree | 943a01d103c1296dc7c07cb188af994354c4d9a3 /pretyping/typeclasses.ml | |
parent | 1769cbaddea77112dd6f336316d8eb9a0945a1e6 (diff) | |
parent | e4282ea99c664d8d58067bee199cbbcf881b60d5 (diff) |
Merge commit 'upstream/8.2.pl1+dfsg'
Diffstat (limited to 'pretyping/typeclasses.ml')
-rw-r--r-- | pretyping/typeclasses.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pretyping/typeclasses.ml b/pretyping/typeclasses.ml index 8680e578..216a0611 100644 --- a/pretyping/typeclasses.ml +++ b/pretyping/typeclasses.ml @@ -7,7 +7,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id: typeclasses.ml 11576 2008-11-10 19:13:15Z msozeau $ i*) +(*i $Id: typeclasses.ml 12189 2009-06-15 05:08:44Z msozeau $ i*) (*i*) open Names @@ -381,7 +381,7 @@ let solve_instanciation_problem = ref (fun _ _ _ -> assert false) let resolve_typeclasses ?(onlyargs=false) ?(split=true) ?(fail=true) env evd = if not (has_typeclasses (Evd.evars_of evd)) then evd else - !solve_instanciations_problem env (Evarutil.nf_evar_defs evd) onlyargs split fail + !solve_instanciations_problem env evd onlyargs split fail let resolve_one_typeclass env evm t = !solve_instanciation_problem env evm t |