diff options
author | msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-12-03 05:01:04 +0000 |
---|---|---|
committer | msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2009-12-03 05:01:04 +0000 |
commit | 52728490e3a4f5cf8171e4a8a009f213d5f15636 (patch) | |
tree | 8102f266ba2a83e7387c88990433778bda82c32f | |
parent | 4320ed3197791eda5dc29649c51dfa7f4e477c6b (diff) |
Rename proper to proper_prf to avoid clash with CoRN,
it's rarely used anyway.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12557 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r-- | theories/Classes/Morphisms.v | 2 | ||||
-rw-r--r-- | theories/Classes/SetoidClass.v | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/theories/Classes/Morphisms.v b/theories/Classes/Morphisms.v index f66fa87b6..dceb49cb6 100644 --- a/theories/Classes/Morphisms.v +++ b/theories/Classes/Morphisms.v @@ -32,7 +32,7 @@ Generalizable All Variables. type for usual morphisms. *) Class Proper {A} (R : relation A) (m : A) : Prop := - proper : R m m. + proper_prf : R m m. (** Respectful morphisms. *) diff --git a/theories/Classes/SetoidClass.v b/theories/Classes/SetoidClass.v index 995b37185..df1c0f757 100644 --- a/theories/Classes/SetoidClass.v +++ b/theories/Classes/SetoidClass.v @@ -122,10 +122,10 @@ Ltac setoidify := repeat setoidify_tac. (** Every setoid relation gives rise to a morphism, in fact every partial setoid does. *) Program Instance setoid_morphism `(sa : Setoid A) : Proper (equiv ++> equiv ++> iff) equiv := - proper. + proper_prf. Program Instance setoid_partial_app_morphism `(sa : Setoid A) (x : A) : Proper (equiv ++> iff) (equiv x) := - proper. + proper_prf. (** Partial setoids don't require reflexivity so we can build a partial setoid on the function space. *) |