aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2003-05-14 09:59:43 +0000
committerherbelin2003-05-14 09:59:43 +0000
commitadfffe936ed1d22f39bd12b7013447473697db74 (patch)
tree0d62d367ea1ff82613c85b34c205b5a68fd74ab8
parent0667c8e4bfd796f6e42c97041ab9d48236791d3b (diff)
Amelioration presentation
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4020 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--theories/Reals/Rfunctions.v2
-rw-r--r--theories/Reals/Rtrigo.v5
-rw-r--r--theories/Reals/Rtrigo_reg.v5
3 files changed, 10 insertions, 2 deletions
diff --git a/theories/Reals/Rfunctions.v b/theories/Reals/Rfunctions.v
index 220e3919bc..d1a49ae9b1 100644
--- a/theories/Reals/Rfunctions.v
+++ b/theories/Reals/Rfunctions.v
@@ -25,6 +25,8 @@ Require Export SplitRmult.
Require Export ArithProp.
Require Omega.
Require Zpower.
+V7only [Import nat_scope.].
+Open Local Scope nat_scope.
V7only [Import R_scope.].
Open Local Scope R_scope.
diff --git a/theories/Reals/Rtrigo.v b/theories/Reals/Rtrigo.v
index c66112d5fe..2696b0453c 100644
--- a/theories/Reals/Rtrigo.v
+++ b/theories/Reals/Rtrigo.v
@@ -19,7 +19,10 @@ Require Export Cos_plus.
Require ZArith_base.
Require Zcomplements.
Require Classical_Prop.
-V7only [Import R_scope.]. Open Local Scope R_scope.
+V7only [Import nat_scope.].
+Open Local Scope nat_scope.
+V7only [Import R_scope.].
+Open Local Scope R_scope.
(** sin_PI2 is the only remaining axiom **)
Axiom sin_PI2 : ``(sin (PI/2))==1``.
diff --git a/theories/Reals/Rtrigo_reg.v b/theories/Reals/Rtrigo_reg.v
index 389fc04f20..1808e1a5a6 100644
--- a/theories/Reals/Rtrigo_reg.v
+++ b/theories/Reals/Rtrigo_reg.v
@@ -14,7 +14,10 @@ Require SeqSeries.
Require Rtrigo.
Require Ranalysis1.
Require PSeries_reg.
-V7only [Import R_scope.]. Open Local Scope R_scope.
+V7only [Import nat_scope.].
+Open Local Scope nat_scope.
+V7only [Import R_scope.].
+Open Local Scope R_scope.
Lemma CVN_R_cos : (fn:nat->R->R) (fn == [N:nat][x:R]``(pow (-1) N)/(INR (fact (mult (S (S O)) N)))*(pow x (mult (S (S O)) N))``) -> (CVN_R fn).
Unfold CVN_R; Intros.