From e60c362019cfd786121d070fbfa9c77dd029b420 Mon Sep 17 00:00:00 2001
From: msozeau
Date: Tue, 2 Jun 2009 18:11:39 +0000
Subject: Backtrack on experimental unification with sort variables: it
 requires major changes in [w_unify] and the conversion functions used by it
 to handle the sort constraints correctly.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12159 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 proofs/clenvtac.ml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'proofs')

diff --git a/proofs/clenvtac.ml b/proofs/clenvtac.ml
index 8df0858910..addf12ca13 100644
--- a/proofs/clenvtac.ml
+++ b/proofs/clenvtac.ml
@@ -73,11 +73,11 @@ let clenv_pose_dependent_evars with_evars clenv =
 
 let clenv_refine with_evars ?(with_classes=true) clenv gls =
   let clenv = clenv_pose_dependent_evars with_evars clenv in
-  let evd = Evd.solve_sort_constraints clenv.evd in
   let evd' = 
     if with_classes then 
-      Typeclasses.resolve_typeclasses ~fail:(not with_evars) clenv.env evd 
-    else evd
+      Typeclasses.resolve_typeclasses ~fail:(not with_evars) 
+	clenv.env clenv.evd 
+    else clenv.evd
   in
   tclTHEN
     (tclEVARS ( evd')) 
-- 
cgit v1.2.3