Now consider remaining conversion problems in solve_remaining_evars.

A step going towards a more uniform evar resolution protocol, currently:
- solve simple constraints (+ actually some heuristics: f.o. unif and
  evar_define's heuristics) but postpone some of the remaining ones [evar_conv]
- try type-classes resolution [resolve_typeclasses]
- apply heuristics on remaining constraints and expect these
  constraints to be resolved [consider_remaining_unif_problems]
- use the implicit tactic for yet open (unconstrained) evars

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14581 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 2 insertions, 5 deletions

diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml
index 7762d18f65..978feec7c2 100644
--- a/pretyping/pretyping.ml
+++ b/pretyping/pretyping.ml
@@ -112,11 +112,8 @@ let resolve_evars env evdref fail_evar resolve_classes =
 	     with e -> if fail_evar then raise e else !evdref)
 
 let solve_remaining_evars fail_evar use_classes hook env initial_sigma (evd,c) =
-  let evdref =
-    if use_classes then
-      ref (Typeclasses.resolve_typeclasses ~split:true ~fail:fail_evar env evd)
-    else
-      ref evd in
+  let evdref = ref evd in
+  resolve_evars env evdref fail_evar use_classes;
   let rec proc_rec c =
     let c = Reductionops.whd_evar !evdref c in
     match kind_of_term c with