X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=cyclegraph.h;h=3f1c9330b4b14631fe70959a0827e70a8d2139bd;hp=a2cb93d7ca702217be5af879cbf0c2ba34f9a67e;hb=438b20cfc07029629c03b4f219c190cbdb5b9d1b;hpb=ed16499d4471e6177a08fb93f33da24465574b63

diff --git a/cyclegraph.h b/cyclegraph.h
index a2cb93d..3f1c933 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -53,8 +53,7 @@ class CycleGraph {
 	void dot_print_edge(FILE *file, const T *from, const U *to, const char *prop);
 #endif
 
-	bool resolvePromise(const Promise *promise, ModelAction *writer,
-			promise_list_t *mustResolve);
+	bool resolvePromise(const Promise *promise, ModelAction *writer);
 
 	SNAPSHOTALLOC
  private:
@@ -66,8 +65,7 @@ class CycleGraph {
 	CycleNode * getNode(const Promise *promise);
 	CycleNode * getNode_noCreate(const ModelAction *act) const;
 	CycleNode * getNode_noCreate(const Promise *promise) const;
-	bool mergeNodes(CycleNode *node1, CycleNode *node2,
-			promise_list_t *mustMerge);
+	bool mergeNodes(CycleNode *node1, CycleNode *node2);
 
 	HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;