diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-07-13 11:04:10 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-07-13 11:04:10 -0400 |
| commit | 3565ae8d2901c4bdd714ceb18f63ee25d4d01bf7 (patch) | |
| tree | 6aca7f2d00eedc0f437a0df8a8e244ab775e6268 /src | |
| parent | 389fe588bb08803d18e0009b31d97159ced6c540 (diff) | |
Fix language bindings and portfolio builds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cvc4.i | 1 | ||||
| -rw-r--r-- | src/main/command_executor_portfolio.cpp | 1 | ||||
| -rw-r--r-- | src/util/Makefile.am | 1 | ||||
| -rw-r--r-- | src/util/result.h | 4 |
4 files changed, 2 insertions, 5 deletions
diff --git a/src/cvc4.i b/src/cvc4.i index 386bd00b5..6e9380146 100644 --- a/src/cvc4.i +++ b/src/cvc4.i @@ -250,7 +250,6 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters; %include "util/bool.i" %include "util/sexpr.i" %include "util/statistics.i" -%include "util/output.i" %include "util/result.i" %include "util/configuration.i" %include "util/bitvector.i" diff --git a/src/main/command_executor_portfolio.cpp b/src/main/command_executor_portfolio.cpp index 2dfd5e6bd..48dcc17ef 100644 --- a/src/main/command_executor_portfolio.cpp +++ b/src/main/command_executor_portfolio.cpp @@ -306,7 +306,6 @@ bool CommandExecutorPortfolio::doCommandSingleton(Command* cmd) if(q != NULL) { d_result = q->getResult(); } - dynamic_cast<QueryCommand*>(cmd) != NULL) { if(d_ostringstreams.size() != 0) { assert(d_numThreads == d_options[options::threads]); diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 23318b95d..59c69889b 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -126,7 +126,6 @@ EXTRA_DIST = \ tuple.i \ record.i \ divisible.i \ - output.i \ cardinality.i \ result.i \ configuration.i \ diff --git a/src/util/result.h b/src/util/result.h index 54ec3a38c..21bf563bd 100644 --- a/src/util/result.h +++ b/src/util/result.h @@ -74,12 +74,12 @@ private: std::string d_inputName; public: - Result(std::string inputName = "") : + Result() : d_sat(SAT_UNKNOWN), d_validity(VALIDITY_UNKNOWN), d_which(TYPE_NONE), d_unknownExplanation(UNKNOWN_REASON), - d_inputName(inputName) { + d_inputName("") { } Result(enum Sat s, std::string inputName = "") : d_sat(s), |