From d27a272511939ba80f1b3658be064268ec9ba55e Mon Sep 17 00:00:00 2001
From: herbelin
Date: Wed, 11 Nov 2009 16:01:31 +0000
Subject: Redoing broken commit r12498 (fixing bug #2167 + attempt to test the
 compatibility of a more robust check of unconvertibility when providing
 "with" arguments to "apply").

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12499 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 pretyping/clenv.ml    |   2 +-
 test-suite/csdp.cache | Bin 45094 -> 44878 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pretyping/clenv.ml b/pretyping/clenv.ml
index a3106b3980..5e4e7558c4 100644
--- a/pretyping/clenv.ml
+++ b/pretyping/clenv.ml
@@ -406,7 +406,7 @@ let clenv_unify_binding_type clenv c t u =
       let evd,c = w_coerce_to_type (cl_env clenv) clenv.evd c t u in
       TypeProcessed, { clenv with evd = evd }, c
     with 
-      | Exc_located (_,Type_errors.TypeError (_,TypeError.ActualType _))
+      | Stdpp.Exc_located (_,Type_errors.TypeError (_,Type_errors.ActualType _))
       | PretypeError (_,NotClean _) as e -> raise e
       | e when precatchable_exception e ->
 (*	  TypeNotProcessed, clenv, c*)
diff --git a/test-suite/csdp.cache b/test-suite/csdp.cache
index 17133cc8de..645de69cda 100644
Binary files a/test-suite/csdp.cache and b/test-suite/csdp.cache differ
-- 
cgit v1.2.3