diff options
| author | Tim King <taking@google.com> | 2015-10-26 12:21:42 -0700 |
|---|---|---|
| committer | Tim King <taking@google.com> | 2015-10-26 12:48:53 -0700 |
| commit | 0f66dd16f35eac64149919f0f4048b422345c5eb (patch) | |
| tree | c37007e7e0b69ac6065f1928a29be54f648158b9 /src/theory/arith/constraint.cpp | |
| parent | 52b8d1508d91a2284c29e3fae02a22307e42a476 (diff) | |
This commit fixes a bug related to a public header depending on a compiler flag. This resulted in user code seeing a different size for the SmtEngine class than what was compiled in the library. Proofs are enabled by default again. See http://cvc4.cs.nyu.edu/bugs/show_bug.cgi?id=688 for more information.
Diffstat (limited to 'src/theory/arith/constraint.cpp')
| -rw-r--r-- | src/theory/arith/constraint.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/theory/arith/constraint.cpp b/src/theory/arith/constraint.cpp index f1cac9044..4acf86d43 100644 --- a/src/theory/arith/constraint.cpp +++ b/src/theory/arith/constraint.cpp @@ -615,10 +615,10 @@ bool Constraint::wellFormedFarkasProof() const { ConstraintCP antecedent = d_database->d_antecedents[p]; if(antecedent == NullConstraint) { return false; } -#ifdef CVC4_PROOF +#if IS_PROOFS_BUILD if(!PROOF_ON()){ return cr.d_farkasCoefficients == RationalVectorCPSentinel; } Assert(PROOF_ON()); - + if(cr.d_farkasCoefficients == RationalVectorCPSentinel){ return false; } if(cr.d_farkasCoefficients->size() < 2){ return false; } @@ -717,9 +717,9 @@ bool Constraint::wellFormedFarkasProof() const { (lhs.isNull() || Constant::isMember(lhs) && Constant(lhs).isZero() ) && rhs.sgn() < 0; -#else +#else /* IS_PROOFS_BUILD */ return true; -#endif +#endif /* IS_PROOFS_BUILD */ } ConstraintP Constraint::makeNegation(ArithVar v, ConstraintType t, const DeltaRational& r){ |