Suppression option immediate_discharge; nettoyage de Declare et conséquences

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

1 files changed, 2 insertions, 5 deletions

diff --git a/kernel/instantiate.ml b/kernel/instantiate.ml
index c1e864523a..0191b63911 100644
--- a/kernel/instantiate.ml
+++ b/kernel/instantiate.ml
@@ -49,11 +49,8 @@ let instantiate_evar sign c args =
     replace_vars inst c
 
 let instantiate_constr sign c args =
-  if Options.immediate_discharge then
-    c
-  else
-    let sign = List.map (fun (sp,b,t) -> (basename sp,b,t)) sign in
-    instantiate sign c args
+  let sign = List.map (fun (sp,b,t) -> (basename sp,b,t)) sign in
+  instantiate sign c args
 
 let instantiate_type sign tty args =
   type_app (fun c -> instantiate_constr sign c args) tty