From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Sat, 13 Jul 2013 15:04:10 +0000 (-0400)
Subject: Fix language bindings and portfolio builds.
X-Git-Tag: cvc5-1.0.0~7287^2~65
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3565ae8d2901c4bdd714ceb18f63ee25d4d01bf7;p=cvc5.git

Fix language bindings and portfolio builds.
---

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),