diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-08-17 22:24:26 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-08-17 22:24:26 +0000 |
commit | 08a57829cdd0ef4c02fee349b4b721d3e4a3f6d1 (patch) | |
tree | 9ea214ffb5a5a03e3c71c09814f17787be6d022b /src/context | |
parent | daf715e2ccb53bd88c6f374840b5d41e72c61c90 (diff) |
Merge from "cc" branch:
CongruenceClosure implementation; CongruenceClosure white-box test.
New UF theory implementation based on new CC module. This one
supports predicates. The two UF implementations exist in parallel
(they can be selected at runtime via the new command line option
"--uf").
Added type infrastructure for TUPLE.
Fixes to unit tests that failed in 16-August-2010 regressions.
Needed to instantiate TheoryEngine with an Options structure, and
explicitly call ->shutdown() on it before destruction (like the
SMTEngine does).
Fixed test makefiles to (1) perform all tests even in the presence of
failures, (2) give proper summaries of subdirectory tests
(e.g. regress0/uf and regress0/precedence)
Other minor changes.
Diffstat (limited to 'src/context')
-rw-r--r-- | src/context/cdmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/context/cdmap.h b/src/context/cdmap.h index c218d05f3..d9cc5b1a3 100644 --- a/src/context/cdmap.h +++ b/src/context/cdmap.h @@ -247,9 +247,9 @@ public: return get(); } - CDOmap& operator=(const Data& data) { + const Data& operator=(const Data& data) { set(data); - return *this; + return data; } CDOmap* next() const { |