Merge branch 'hamed' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler

diff --git a/src/AST/boolean.h b/src/AST/boolean.h
index d958dc02af701afdeb4f47ac578818512e592db8..4bab81119c939549c110b9dd8ff3942c4ea94626 100644 (file)
--- a/src/AST/boolean.h
+++ b/src/AST/boolean.h
@@ -20,6 +20,7 @@
 class Boolean : public ASTNode {
  public:
        Boolean(ASTNodeType _type);
+       virtual ~Boolean() {}
        Polarity polarity;
        BooleanValue boolVal;
        Vector<Boolean *> parents;

diff --git a/src/AST/element.h b/src/AST/element.h
index fe5f42b0b3b83c76bb99293743301f7b6916b687..6a8ea956a6fc0b788e4d79fc0296b196dc9e4da2 100644 (file)
--- a/src/AST/element.h
+++ b/src/AST/element.h
@@ -13,7 +13,7 @@
 class Element : public ASTNode {
  public:
        Element(ASTNodeType type);
-       ~Element();
+       virtual ~Element();
        Vector<ASTNode *> parents;
        ElementEncoding encoding;
        MEMALLOC;

diff --git a/src/AST/predicate.h b/src/AST/predicate.h
index c59a6a6078bdc8f1838fe215cb2f290014731da4..96f462d499e140195508c08fa23e6de856856844 100644 (file)
--- a/src/AST/predicate.h
+++ b/src/AST/predicate.h
@@ -10,6 +10,7 @@
 class Predicate {
  public:
   Predicate(PredicateType _type) : type(_type) {}
+       virtual ~Predicate() {}
        PredicateType type;
        MEMALLOC;
 };

diff --git a/src/csolver.cc b/src/csolver.cc
index cdbb919eac5c48fb80bbeab7fc259de3907b2a34..64f0851fa74061e507a96569847ab064edda5fd1 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -155,7 +155,7 @@ Boolean *CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint nu
 }
 
 Boolean *CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, Boolean *undefinedStatus) {
-       Boolean *boolean = new BooleanPredicate(predicate, inputs, numInputs, undefinedStatus);
+       BooleanPredicate *boolean = new BooleanPredicate(predicate, inputs, numInputs, undefinedStatus);
        allBooleans.push(boolean);
        return boolean;
 }