diff options
| author |  Enrico Tassi <gareuselesinge@debian.org> | 2015-07-15 13:15:50 +0200 |
|---|---|---|
| committer | Enrico Tassi <gareuselesinge@debian.org> | 2015-07-15 13:15:50 +0200 |
| commit | e347929583f820a2cc0296597b6382309e930989 (patch) | |
| tree | cdc3f18fc5c66a9d3d7cc8404c6a295169e41fcc /plugins/omega/Omega.v | |
| parent | c01be74d81a5466c58f8dc6c568db286b0979997 (diff) | |
| parent | 0aa2544d04dbd4b6ee665b551ed165e4fb02d2fa (diff) | |
Merge tag 'upstream/8.5_beta2+dfsg' into test
Upstream version 8.5~beta2+dfsg
Diffstat (limited to 'plugins/omega/Omega.v')
| -rw-r--r-- | plugins/omega/Omega.v | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/plugins/omega/Omega.v b/plugins/omega/Omega.v index 7400d462..a5f90dd6 100644 --- a/plugins/omega/Omega.v +++ b/plugins/omega/Omega.v @@ -13,10 +13,11 @@ (* *) (**************************************************************************) -(* We do not require [ZArith] anymore, but only what's necessary for Omega *) +(* We import what is necessary for Omega *) Require Export ZArith_base. Require Export OmegaLemmas. Require Export PreOmega. + Declare ML Module "omega_plugin". Hint Resolve Z.le_refl Z.add_comm Z.add_assoc Z.mul_comm Z.mul_assoc Z.add_0_l @@ -25,11 +26,6 @@ Hint Resolve Z.le_refl Z.add_comm Z.add_assoc Z.mul_comm Z.mul_assoc Z.add_0_l Require Export Zhints. -(* -(* The constant minus is required in coq_omega.ml *) -Require Minus. -*) - Hint Extern 10 (_ = _ :>nat) => abstract omega: zarith. Hint Extern 10 (_ <= _) => abstract omega: zarith. Hint Extern 10 (_ < _) => abstract omega: zarith. |