diff options
author | Morgan Deters <mdeters@gmail.com> | 2011-09-02 20:41:08 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2011-09-02 20:41:08 +0000 |
commit | 1d18e5ebed9a5b20ed6a8fe21d11842acf6fa7ea (patch) | |
tree | 7074f04453914bc377ff6aeb307dd17b82b76ff3 /src/util/ntuple.h | |
parent | 74770f1071e6102795393cf65dd0c651038db6b4 (diff) |
Merge from my post-smtcomp branch. Includes:
Dumping infrastructure. Can dump preprocessed queries and clauses. Can
also dump queries (for testing with another solver) to see if any conflicts
are missed, T-propagations are missed, all lemmas are T-valid, etc. For a
full list of options see --dump=help.
CUDD building much cleaner.
Documentation and assertion fixes.
Printer improvements, printing of commands in language-defined way, etc.
Typechecker stuff in expr package now autogenerated, no need to manually
edit the expr package when adding a new theory.
CVC3 compatibility layer (builds as libcompat).
SWIG detection and language binding support (infrastructure).
Support for some Z3 extended commands (like datatypes) in SMT-LIBv2 mode
(when not in compliance mode).
Copyright and file headers regenerated.
Diffstat (limited to 'src/util/ntuple.h')
-rw-r--r-- | src/util/ntuple.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/util/ntuple.h b/src/util/ntuple.h index 4c9a033a1..4f8b73945 100644 --- a/src/util/ntuple.h +++ b/src/util/ntuple.h @@ -30,6 +30,11 @@ public: T1 first; T2 second; T3 third; + triple(const T1& t1, const T2& t2, const T3& t3) : + first(t1), + second(t2), + third(t3) { + } };/* class triple<> */ template <class T1, class T2, class T3> @@ -45,9 +50,12 @@ public: T2 second; T3 third; T4 fourth; - quad(const T1& t1, const T2& t2, const T3& t3, const T4& t4) - : first(t1), second(t2), third(t3), fourth(t4) - { } + quad(const T1& t1, const T2& t2, const T3& t3, const T4& t4) : + first(t1), + second(t2), + third(t3), + fourth(t4) { + } };/* class quad<> */ template <class T1, class T2, class T3, class T4> |