From e0e008cef9f5b2ead64708651f52b739a8225993 Mon Sep 17 00:00:00 2001
From: letouzey
Date: Wed, 13 Jan 2010 16:53:01 +0000
Subject: Try to avoid re-declaring Equivalence, especially for Logic.eq

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12662 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 theories/Structures/Equalities.v | 4 +++-
 theories/Structures/OrdersTac.v  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/theories/Structures/Equalities.v b/theories/Structures/Equalities.v
index 76f539764a..487b1d0cc0 100644
--- a/theories/Structures/Equalities.v
+++ b/theories/Structures/Equalities.v
@@ -175,7 +175,9 @@ End HasUsualEq.
 Module Type UsualEq <: Eq := Typ <+ HasUsualEq.
 
 Module Type UsualIsEq (E:UsualEq) <: IsEq E.
- Program Instance eq_equiv : Equivalence E.eq.
+ (* No Instance syntax to avoid saturating the Equivalence tables *)
+ Lemma eq_equiv : Equivalence E.eq.
+ Proof. exact eq_equivalence. Qed.
 End UsualIsEq.
 
 Module Type UsualIsEqOrig (E:UsualEq) <: IsEqOrig E.
diff --git a/theories/Structures/OrdersTac.v b/theories/Structures/OrdersTac.v
index 80be890265..35484ae77a 100644
--- a/theories/Structures/OrdersTac.v
+++ b/theories/Structures/OrdersTac.v
@@ -304,7 +304,8 @@ Definition lt := flip O.lt.
 Definition le := flip O.le.
 Include EqLtLeNotation.
 
-Instance eq_equiv : Equivalence eq.
+(* No Instance syntax to avoid saturating the Equivalence tables *)
+Definition eq_equiv := O.eq_equiv.
 
 Instance lt_strorder: StrictOrder lt.
 Proof. unfold lt; auto with *. Qed.
-- 
cgit v1.2.3