diff options
| author | Matthieu Sozeau | 2013-12-17 16:23:16 +0100 |
|---|---|---|
| committer | Matthieu Sozeau | 2013-12-17 16:23:16 +0100 |
| commit | 5080f91a191aa08bf29790addb5b8614ba8323a8 (patch) | |
| tree | 733d449608a0e392c7033e18d3f699b144ba0948 /plugins/funind | |
| parent | 35e47b6be8d9e97b58464daccc28d179951b5e47 (diff) | |
| parent | 16677f3d4e71b2f971ed36bbbc3b95d8908a1b13 (diff) | |
Merge branch 'trunk' of github.com:coq/coq into trunk
Diffstat (limited to 'plugins/funind')
| -rw-r--r-- | plugins/funind/indfun.ml | 2 | ||||
| -rw-r--r-- | plugins/funind/merge.ml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/funind/indfun.ml b/plugins/funind/indfun.ml index 3dc59b7ca7..661e5e4869 100644 --- a/plugins/funind/indfun.ml +++ b/plugins/funind/indfun.ml @@ -131,7 +131,7 @@ let rec abstract_glob_constr c = function (abstract_glob_constr c bl) let interp_casted_constr_with_implicits sigma env impls c = - Constrintern.intern_gen Pretyping.WithoutTypeConstraint sigma env ~impls + Constrintern.intern_gen Pretyping.WithoutTypeConstraint env ~impls ~allow_patvar:false ~ltacvars:(Id.Set.empty, Id.Set.empty) c (* diff --git a/plugins/funind/merge.ml b/plugins/funind/merge.ml index b7c471f4ae..ac54e44cc7 100644 --- a/plugins/funind/merge.ml +++ b/plugins/funind/merge.ml @@ -71,7 +71,7 @@ let isVarf f x = let ident_global_exist id = try let ans = CRef (Libnames.Ident (Loc.ghost,id)) in - let _ = ignore (Constrintern.intern_constr Evd.empty (Global.env()) ans) in + let _ = ignore (Constrintern.intern_constr (Global.env()) ans) in true with e when Errors.noncritical e -> false |