Merge
authorbdemsky <bdemsky@uci.edu>
Mon, 18 Sep 2017 22:42:54 +0000 (15:42 -0700)
committerbdemsky <bdemsky@uci.edu>
Mon, 18 Sep 2017 22:42:54 +0000 (15:42 -0700)
1  2 
src/AST/set.cc
src/AST/set.h

diff --cc src/AST/set.cc
Simple merge
diff --cc 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 */