aboutsummaryrefslogtreecommitdiff
path: root/theories/ZArith
diff options
context:
space:
mode:
authorletouzey2011-06-28 23:30:10 +0000
committerletouzey2011-06-28 23:30:10 +0000
commita0b31c88aa2bcd50524cbc48d16eb78c62da3445 (patch)
treeebf4533e46fb630e520a745f2b3df41d489a33ec /theories/ZArith
parent2941378aee6586bcff9f8a117f11e5c5c2327607 (diff)
Deletion of useless Zsqrt_def
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14245 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'theories/ZArith')
-rw-r--r--theories/ZArith/ZArith.v2
-rw-r--r--theories/ZArith/Zsqrt_compat.v9
-rw-r--r--theories/ZArith/Zsqrt_def.v18
-rw-r--r--theories/ZArith/vo.itarget1
4 files changed, 6 insertions, 24 deletions
diff --git a/theories/ZArith/ZArith.v b/theories/ZArith/ZArith.v
index 239d55cdc8..5a927fe6b8 100644
--- a/theories/ZArith/ZArith.v
+++ b/theories/ZArith/ZArith.v
@@ -13,7 +13,7 @@ Require Export ZArith_base.
(** Extra definitions *)
Require Export
- Zpow_def Zsqrt_def Zlog_def Zdigits_def.
+ Zpow_def Zlog_def Zdigits_def.
(** Extra modules using [Omega] or [Ring]. *)
diff --git a/theories/ZArith/Zsqrt_compat.v b/theories/ZArith/Zsqrt_compat.v
index 1533eb9254..4584c3f8fe 100644
--- a/theories/ZArith/Zsqrt_compat.v
+++ b/theories/ZArith/Zsqrt_compat.v
@@ -11,12 +11,13 @@ Require Import Omega.
Require Export ZArith_base.
Open Local Scope Z_scope.
-(** !! This file is deprecated !!
+(** THIS FILE IS DEPRECATED
- Please use rather Zsqrt_def.Zsqrt (or Zsqrtrem).
- Unlike here, proofs there are fully separated from functions.
+ Instead of the various [Zsqrt] defined here, please use rather
+ [Z.sqrt] (or [Z.sqrtrem]). The latter are pure functions without
+ proof parts, and more results are available about them.
Some equivalence proofs between the old and the new versions
- can be found below. A Require Import ZArith provides by default
+ can be found below. Importing ZArith will provides by default
the new versions.
*)
diff --git a/theories/ZArith/Zsqrt_def.v b/theories/ZArith/Zsqrt_def.v
deleted file mode 100644
index 2012e8bcc4..0000000000
--- a/theories/ZArith/Zsqrt_def.v
+++ /dev/null
@@ -1,18 +0,0 @@
-(************************************************************************)
-(* v * The Coq Proof Assistant / The Coq Development Team *)
-(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010 *)
-(* \VV/ **************************************************************)
-(* // * This file is distributed under the terms of the *)
-(* * GNU Lesser General Public License Version 2.1 *)
-(************************************************************************)
-
-(** Definition of a square root function for Z. *)
-
-Require Import BinPos BinInt.
-
-Notation Zsqrtrem := Z.sqrtrem (only parsing).
-Notation Zsqrt := Z.sqrt (only parsing).
-Notation Zsqrtrem_spec := Z.sqrtrem_spec (only parsing).
-Notation Zsqrt_spec := Z.sqrt_spec (only parsing).
-Notation Zsqrt_neg := Z.sqrt_neg (only parsing).
-Notation Zsqrtrem_sqrt := Z.sqrtrem_sqrt (only parsing).
diff --git a/theories/ZArith/vo.itarget b/theories/ZArith/vo.itarget
index 10c2d71b23..9605735dcd 100644
--- a/theories/ZArith/vo.itarget
+++ b/theories/ZArith/vo.itarget
@@ -29,7 +29,6 @@ Zpower.vo
Zpow_facts.vo
Zsqrt_compat.vo
Zwf.vo
-Zsqrt_def.vo
Zlog_def.vo
Zeuclid.vo
Zdigits_def.vo \ No newline at end of file