diff options
author | Morgan Deters <mdeters@gmail.com> | 2011-03-15 20:32:13 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2011-03-15 20:32:13 +0000 |
commit | 8fb7c711588cb070c1e4a1d076b47f9277bfc3fe (patch) | |
tree | cedd18e59b24d8b6adf79bb6581b66b1af23d17a /src/expr | |
parent | 1bdb81e52c7865f89663f97f6bc1244f3e4f6b12 (diff) |
Merge from cudd branch. This mostly just adds support for linking
against cudd libraries, the propositional_query class (in util/),
which uses cudd if it's available (and otherwise answers UNKNOWN for
all queries), and the arith theory support for it (currently disabled
per Tim's request, so he can clean it up).
Other changes include:
* contrib/debug-keys - script to print all used keys under Debug(), Trace()
* test/regress/run_regression - minor fix (don't export a variable)
* configure.ac - replace a comment removed by dejan's google perf commit
* some minor copyright/documentation updates, and minor changes to source
text to make 'clang --analyze' happy.
Diffstat (limited to 'src/expr')
-rw-r--r-- | src/expr/type.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr/type.h b/src/expr/type.h index 453eaf5c4..d357c869e 100644 --- a/src/expr/type.h +++ b/src/expr/type.h @@ -34,6 +34,8 @@ class NodeManager; class ExprManager; class TypeNode; +class SmtEngine; + template <bool ref_count> class NodeTemplate; @@ -69,7 +71,6 @@ std::ostream& operator<<(std::ostream& out, const Type& t) CVC4_PUBLIC; class CVC4_PUBLIC Type { friend class SmtEngine; - friend class SmtEnginePrivate; friend class ExprManager; friend class TypeNode; friend class TypeHashStrategy; |