diff options
author | Tim King <taking@cs.nyu.edu> | 2012-03-02 23:37:06 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2012-03-02 23:37:06 +0000 |
commit | 98b2fe2c6fefb15b57d2eae6bda505e1f41da451 (patch) | |
tree | 4124caa3d7f94aec78ff735fa766149aee86e842 /src/context/cdqueue.h | |
parent | 068107e1d1f705eb9054b4309a26236230687d80 (diff) |
This commit merges in the changes from branches/arithmetic/refactor0
- Improved the checks in AssertLower and AssertUpper so that redundant bounds cause less work.
- Because of the above change, d_constantIntegerVariables now cannot have duplicate elements enqueued. This allows removing d_varsInDioSolver.
- Fix to an assertion in CDQueue.
- Implements a CDArithVarSet using a vector of booleans and CDList.
- Refactored ArithVar out of arith_utilities.h. Miscellaneous cleanup of arithmetic.
Diffstat (limited to 'src/context/cdqueue.h')
-rw-r--r-- | src/context/cdqueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/context/cdqueue.h b/src/context/cdqueue.h index f84b66349..d733e0b1c 100644 --- a/src/context/cdqueue.h +++ b/src/context/cdqueue.h @@ -122,7 +122,7 @@ public: // Some elements have been enqueued and dequeued in the same // context and now the queue is empty we can destruct them. CDList<T>::truncateList(d_lastsave); - Assert(d_size == d_lastsave); + Assert(CDList<T>::d_size == d_lastsave); d_iter = d_lastsave; } } |