Merging a squash of the branch timothy-king/CVC4/glpknecfix c95bf7d4f1 into master. See the CAV14 submission for an explanation of the changes to the integer solver's behavior. If compiled against the our custom extension of glpk, https://github.com/timothy-king/glpk-cut-log, this should have substantial differences in behavior. This should have moderate performance differences for linear real and integer arithmetic even if these features are disabled.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/theory/arith/constraint_forward.h b/src/theory/arith/constraint_forward.h
index f01c64b60..19326c0b3 100644
--- a/src/theory/arith/constraint_forward.h
+++ b/src/theory/arith/constraint_forward.h
@@ -16,23 +16,26 @@
  ** minimize interaction between header files.
  **/
 
-#include "cvc4_private.h"
-
 #ifndef __CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H
 #define __CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H
 
+#include "cvc4_private.h"
+#include <vector>
+
 namespace CVC4 {
 namespace theory {
 namespace arith {
 
-class ConstraintValue;
-typedef ConstraintValue* Constraint;
-typedef const ConstraintValue* const ConstConstraint;
+class Constraint_;
+typedef Constraint_* ConstraintP;
+typedef const Constraint_* ConstraintCP;
 
-static const Constraint NullConstraint = NULL;
+const ConstraintP NullConstraint = NULL;
 
 class ConstraintDatabase;
 
+typedef std::vector<ConstraintCP> ConstraintCPVec;
+
 }/* CVC4::theory::arith namespace */
 }/* CVC4::theory namespace */
 }/* CVC4 namespace */