Merge

diff --cc src/AST/set.cc
Simple merge

diff --cc src/AST/set.h
index 088eca577cd7b75611d9c4095dbd87625e7395b2,ef10b39bdaf3dc75830dde6d980a0a155b1293eb..ad89504db94e76170464d1eb5c29c943dd1106c3
--- 1/src/AST/set.h
--- 2/src/AST/set.h
+++ b/src/AST/set.h
@@@ -24,7 -24,7 +24,8 @@@ public
        uint64_t getNewUniqueItem() {return low++;}
        uint64_t getMemberAt(uint index);
        uint64_t getElement(uint index);
 +      uint getUnionSize(Set *s);
+       virtual bool isMutableSet() {return false;}
        virtual Set *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serializer);
        CMEMALLOC;
@@@ -34,7 -34,9 +35,8 @@@ protected
        uint64_t low;//also used to count unique items
        uint64_t high;
        Vector<uint64_t> *members;
 -
  };
  
+ int intcompare(const void *p1, const void *p2);
  #endif/* SET_H */