aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2009-11-11 16:01:31 +0000
committerherbelin2009-11-11 16:01:31 +0000
commitd27a272511939ba80f1b3658be064268ec9ba55e (patch)
tree0bc0f8f9d025f0e3eacbbf58dd990f3326d197c6
parent530eb0b1cbaf8d918aafee6f1aa4849804eebdb7 (diff)
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
-rw-r--r--pretyping/clenv.ml2
-rw-r--r--test-suite/csdp.cachebin45094 -> 44878 bytes
2 files changed, 1 insertions, 1 deletions
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
--- a/test-suite/csdp.cache
+++ b/test-suite/csdp.cache
Binary files differ