Fix language bindings and portfolio builds.

diff --git a/src/cvc4.i b/src/cvc4.i
index 386bd00b5c13dc0cb3755fd541d135e07e5878d2..6e938014616e332f61883e8d6c7896cafa228277 100644 (file)
--- 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 2dfd5e6bde71cc89cbbe5e511f11f63318fc181e..48dcc17ef409e267ef834d0e89da856f8fb362fa 100644 (file)
--- 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 23318b95d247b7bbaab64247e4d1567e29dc9209..59c69889b4f6ab5e1b3741cda8d3d91b2dcee429 100644 (file)
--- 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 54ec3a38c43fa8eb106d744af96f97aeab2e3ebd..21bf563bd928d53fc48005507544a4e19fcf0c91 100644 (file)
--- 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),