From: bdemsky <bdemsky@uci.edu>
Date: Mon, 18 Sep 2017 22:42:54 +0000 (-0700)
Subject: Merge
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=80c81c7a3aeeb577e3c4f514b964e5c84ac6c658

Merge
---

80c81c7a3aeeb577e3c4f514b964e5c84ac6c658
diff --cc src/AST/set.h
index 088eca5,ef10b39..ad89504
--- a/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 */