aboutsummaryrefslogtreecommitdiff
path: root/theories
diff options
context:
space:
mode:
authorGuillaume Melquiond2016-01-05 20:07:37 +0100
committerGuillaume Melquiond2016-01-05 20:07:37 +0100
commit7ca0319268c2c6912e08c53deb742d5f7631e210 (patch)
tree5c9613224ca234af907374485b6f2241303e23ee /theories
parent5d26829704b2602ede45183cba54ab219e453c0e (diff)
parente4a682e2f2c91fac47f55cd8619af2321b2e4c30 (diff)
Merge remote-tracking branch 'origin/v8.5' into trunk
Diffstat (limited to 'theories')
-rw-r--r--theories/Classes/RelationClasses.v4
-rw-r--r--theories/Structures/OrdersFacts.v2
2 files changed, 5 insertions, 1 deletions
diff --git a/theories/Classes/RelationClasses.v b/theories/Classes/RelationClasses.v
index 15cb02d37f..6248babd0e 100644
--- a/theories/Classes/RelationClasses.v
+++ b/theories/Classes/RelationClasses.v
@@ -208,6 +208,10 @@ Hint Extern 4 (subrelation (flip _) _) =>
class_apply @subrelation_symmetric : typeclass_instances.
Arguments irreflexivity {A R Irreflexive} [x] _.
+Arguments symmetry {A} {R} {_} [x] [y] _.
+Arguments asymmetry {A} {R} {_} [x] [y] _ _.
+Arguments transitivity {A} {R} {_} [x] [y] [z] _ _.
+Arguments Antisymmetric A eqA {_} _.
Hint Resolve irreflexivity : ord.
diff --git a/theories/Structures/OrdersFacts.v b/theories/Structures/OrdersFacts.v
index 88fbd8c11c..954d3df203 100644
--- a/theories/Structures/OrdersFacts.v
+++ b/theories/Structures/OrdersFacts.v
@@ -90,7 +90,7 @@ Module Type OrderedTypeFullFacts (Import O:OrderedTypeFull').
Instance le_order : PartialOrder eq le.
Proof. compute; iorder. Qed.
- Instance le_antisym : Antisymmetric eq le.
+ Instance le_antisym : Antisymmetric _ eq le.
Proof. apply partial_order_antisym; auto with *. Qed.
Lemma le_not_gt_iff : forall x y, x<=y <-> ~y<x.