From: bdemsky <bdemsky@uci.edu>
Date: Wed, 5 Jul 2017 23:44:55 +0000 (-0700)
Subject: Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler into... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eda32d99c1abb9415fb1b44dbf523de3436de41c;p=satune.git

Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler into brian
---

eda32d99c1abb9415fb1b44dbf523de3436de41c
diff --cc src/Collections/structs.h
index 0d57a8a,a45eb13..6b274ce
--- a/src/Collections/structs.h
+++ b/src/Collections/structs.h
@@@ -10,20 -10,23 +10,20 @@@ ArrayDef(Element, Element *)
  ArrayDef(Boolean, Boolean *);
  ArrayDef(Set, Set *);
  
 -
 -VectorDef(Table, Table *, 4);
 -VectorDef(Set, Set *, 4);
 -VectorDef(Boolean, Boolean *, 4);
 -VectorDef(Constraint, Constraint *, 4);
 -VectorDef(Function, Function *, 4);
 -VectorDef(Predicate, Predicate *, 4);
 -VectorDef(Element, Element *, 4);
 -VectorDef(Order, Order *, 4);
 -VectorDef(TableEntry, TableEntry *, 4);
 -VectorDef(ASTNode, ASTNode *, 4);
 -VectorDef(Int, uint64_t, 4);
 -
 -
 +VectorDef(Table, Table *);
 +VectorDef(Set, Set *);
 +VectorDef(Boolean, Boolean *);
 +VectorDef(Constraint, Constraint *);
 +VectorDef(Function, Function *);
 +VectorDef(Predicate, Predicate *);
 +VectorDef(Element, Element *);
 +VectorDef(Order, Order *);
 +VectorDef(TableEntry, TableEntry *);
 +VectorDef(ASTNode, ASTNode *);
 +VectorDef(Int, uint64_t);
  
  HashTableDef(Void, void *, void *);
- HashTableDef(BoolConst, BooleanOrder *, Constraint *);
+ HashTableDef(BoolConst, OrderPair *, Constraint *);
  
  HashSetDef(Void, void *);