* some build fixes; thanks; thanks to Kunal Ganeshpure for noting these issues

* build bugfix for win32
* also fix a bug re: tuples and records in the datatypes rewriter

These fixes are for both trunk and 1.0.x branches.

(cherry picked from commit 8c8985f024cec925f774ff32ebccc306be8e4b26)

6 files changed, 8 insertions, 2 deletions

diff --git a/src/prop/bvminisat/utils/System.h b/src/prop/bvminisat/utils/System.h
index f9fe708bb..4b4b73cb9 100644
--- a/src/prop/bvminisat/utils/System.h
+++ b/src/prop/bvminisat/utils/System.h
@@ -43,7 +43,7 @@ extern double memUsedPeak();        // Peak-memory in mega bytes (returns 0 for
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #include <time.h>
 
-static inline double Minisat::cpuTime(void) { return (double)clock() / CLOCKS_PER_SEC; }
+static inline double BVMinisat::cpuTime(void) { return (double)clock() / CLOCKS_PER_SEC; }
 
 #else
 #include <sys/time.h>
diff --git a/src/theory/datatypes/datatypes_rewriter.h b/src/theory/datatypes/datatypes_rewriter.h
index 7d7578983..b503087c9 100644
--- a/src/theory/datatypes/datatypes_rewriter.h
+++ b/src/theory/datatypes/datatypes_rewriter.h
@@ -177,7 +177,7 @@ public:
     }
     if(in.getKind() == kind::RECORD_UPDATE &&
        in[0].getKind() == kind::RECORD) {
-      size_t ix = in[0].getOperator().getConst<Record>().getIndex(in.getConst<RecordUpdate>().getField());
+      size_t ix = in[0].getOperator().getConst<Record>().getIndex(in.getOperator().getConst<RecordUpdate>().getField());
       NodeBuilder<> b(kind::RECORD);
       b << in[0].getOperator();
       for(TNode::const_iterator i = in[0].begin(); i != in[0].end(); ++i, --ix) {
diff --git a/src/util/exception.h b/src/util/exception.h
index 31318775f..b367f20e5 100644
--- a/src/util/exception.h
+++ b/src/util/exception.h
@@ -22,6 +22,7 @@
 #include <iostream>
 #include <string>
 #include <sstream>
+#include <stdexcept>
 #include <exception>
 #include <cstdlib>
 #include <cstdarg>
diff --git a/src/util/lemma_input_channel.h b/src/util/lemma_input_channel.h
index 785ddada3..44ab05a41 100644
--- a/src/util/lemma_input_channel.h
+++ b/src/util/lemma_input_channel.h
@@ -26,6 +26,8 @@ namespace CVC4 {
 
 class CVC4_PUBLIC LemmaInputChannel {
 public:
+  virtual ~LemmaInputChannel() throw() { }
+
   virtual bool hasNewLemma() = 0;
   virtual Expr getNewLemma() = 0;
 
diff --git a/src/util/lemma_output_channel.h b/src/util/lemma_output_channel.h
index 8b37fe0da..47ba7c346 100644
--- a/src/util/lemma_output_channel.h
+++ b/src/util/lemma_output_channel.h
@@ -32,6 +32,8 @@ namespace CVC4 {
  */
 class CVC4_PUBLIC LemmaOutputChannel {
 public:
+  virtual ~LemmaOutputChannel() throw() { }
+
   /**
    * Notifies this output channel that there's a new lemma.
    * The lemma may or may not be in CNF.
diff --git a/src/util/proof.h b/src/util/proof.h
index 6539dadc8..9d189e994 100644
--- a/src/util/proof.h
+++ b/src/util/proof.h
@@ -26,6 +26,7 @@ namespace CVC4 {
 
 class CVC4_PUBLIC Proof {
 public:
+  virtual ~Proof() { }
   virtual void toStream(std::ostream& out) = 0;
 };/* class Proof */