aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorletouzey2010-01-14 14:18:31 +0000
committerletouzey2010-01-14 14:18:31 +0000
commit41beba06c59bd5c4e954b46f27c7667be58f4982 (patch)
tree26341903cdc4e2b3f1967269fea6ca190550da30
parentd4e303c65b5539112ba42d642dcc064cbed3bdba (diff)
Avoid some more re-declarations of Equivalence instances
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12671 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--theories/Numbers/Integer/Binary/ZBinary.v2
-rw-r--r--theories/Numbers/NatInt/NZOrder.v2
-rw-r--r--theories/Numbers/Natural/Binary/NBinary.v2
-rw-r--r--theories/Numbers/Natural/Peano/NPeano.v2
-rw-r--r--theories/QArith/QOrderedType.v2
5 files changed, 5 insertions, 5 deletions
diff --git a/theories/Numbers/Integer/Binary/ZBinary.v b/theories/Numbers/Integer/Binary/ZBinary.v
index cf3986b724..835f79585d 100644
--- a/theories/Numbers/Integer/Binary/ZBinary.v
+++ b/theories/Numbers/Integer/Binary/ZBinary.v
@@ -34,7 +34,7 @@ Qed.
(** Basic operations. *)
-Instance eq_equiv : Equivalence (@eq Z).
+Definition eq_equiv : Equivalence (@eq Z) := eq_equivalence.
Local Obligation Tactic := simpl_relation.
Program Instance succ_wd : Proper (eq==>eq) Zsucc.
Program Instance pred_wd : Proper (eq==>eq) Zpred.
diff --git a/theories/Numbers/NatInt/NZOrder.v b/theories/Numbers/NatInt/NZOrder.v
index ed59bca436..aa41a35ea9 100644
--- a/theories/Numbers/NatInt/NZOrder.v
+++ b/theories/Numbers/NatInt/NZOrder.v
@@ -127,7 +127,7 @@ Module OrderElts <: TotalOrder.
Definition eq := eq.
Definition lt := lt.
Definition le := le.
- Instance eq_equiv : Equivalence eq.
+ Definition eq_equiv := eq_equiv.
Instance lt_strorder : StrictOrder lt.
Proof. split; [ exact lt_irrefl | exact lt_trans ]. Qed.
Instance lt_compat : Proper (eq==>eq==>iff) lt.
diff --git a/theories/Numbers/Natural/Binary/NBinary.v b/theories/Numbers/Natural/Binary/NBinary.v
index 93922aa437..7211112f26 100644
--- a/theories/Numbers/Natural/Binary/NBinary.v
+++ b/theories/Numbers/Natural/Binary/NBinary.v
@@ -31,7 +31,7 @@ Qed.
(** Basic operations. *)
-Instance eq_equiv : Equivalence (@eq N).
+Definition eq_equiv : Equivalence (@eq N) := eq_equivalence.
Local Obligation Tactic := simpl_relation.
Program Instance succ_wd : Proper (eq==>eq) Nsucc.
Program Instance pred_wd : Proper (eq==>eq) Npred.
diff --git a/theories/Numbers/Natural/Peano/NPeano.v b/theories/Numbers/Natural/Peano/NPeano.v
index 962bc8de0b..d42bb810d2 100644
--- a/theories/Numbers/Natural/Peano/NPeano.v
+++ b/theories/Numbers/Natural/Peano/NPeano.v
@@ -27,7 +27,7 @@ Qed.
(** Basic operations. *)
-Instance eq_equiv : Equivalence (@eq nat).
+Definition eq_equiv : Equivalence (@eq nat) := eq_equivalence.
Local Obligation Tactic := simpl_relation.
Program Instance succ_wd : Proper (eq==>eq) S.
Program Instance pred_wd : Proper (eq==>eq) pred.
diff --git a/theories/QArith/QOrderedType.v b/theories/QArith/QOrderedType.v
index f3229d7236..4d92aadb10 100644
--- a/theories/QArith/QOrderedType.v
+++ b/theories/QArith/QOrderedType.v
@@ -15,7 +15,7 @@ Local Open Scope Q_scope.
Module Q_as_DT <: DecidableTypeFull.
Definition t := Q.
Definition eq := Qeq.
- Instance eq_equiv : Equivalence Qeq.
+ Definition eq_equiv := Q_setoid.
Definition eqb := Qeq_bool.
Definition eqb_eq := Qeq_bool_iff.