diff options
author | Yann Herklotz <git@yannherklotz.com> | 2021-09-17 16:52:29 +0100 |
---|---|---|
committer | Yann Herklotz <git@yannherklotz.com> | 2021-09-17 16:52:29 +0100 |
commit | 4be142376801c205ffd701208fad8eedf2c08d90 (patch) | |
tree | d2f4d54cc34319e380e349eddef61c2994202e8b /lib/Parmov.v | |
parent | 48a9dcbdc968bcf05b4eec17b8c7fd471fb80240 (diff) | |
parent | c9fad7cd7bdc4e79fb06a1d39abfa0d5471623e5 (diff) | |
download | compcert-4be142376801c205ffd701208fad8eedf2c08d90.tar.gz compcert-4be142376801c205ffd701208fad8eedf2c08d90.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/Parmov.v')
-rw-r--r-- | lib/Parmov.v | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/Parmov.v b/lib/Parmov.v index db27e83f..d7cab86a 100644 --- a/lib/Parmov.v +++ b/lib/Parmov.v @@ -8,10 +8,11 @@ (* *) (* Copyright Institut National de Recherche en Informatique et en *) (* Automatique. All rights reserved. This file is distributed *) -(* under the terms of the GNU General Public License as published by *) -(* the Free Software Foundation, either version 2 of the License, or *) -(* (at your option) any later version. This file is also distributed *) -(* under the terms of the INRIA Non-Commercial License Agreement. *) +(* under the terms of the GNU Lesser General Public License as *) +(* published by the Free Software Foundation, either version 2.1 of *) +(* the License, or (at your option) any later version. *) +(* This file is also distributed under the terms of the *) +(* INRIA Non-Commercial License Agreement. *) (* *) (* *********************************************************************) @@ -1106,7 +1107,7 @@ Lemma measure_decreasing_1: forall st st', dtransition st st' -> measure st' < measure st. Proof. - induction 1; repeat (simpl; rewrite List.app_length); simpl; omega. + induction 1; repeat (simpl; rewrite List.app_length); simpl; lia. Qed. Lemma measure_decreasing_2: |