X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=25401d9a3d349d07f6c4b11fe4a140e041f82394;hb=b2f34d7f1d030f414786ea0b1a5709dcac604c7b;hp=d5c6a92af78715de0ff4f2c323a578b7a43f6ff1;hpb=7524803854c2de38c0311fe5037e3c17105ccfaa;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index d5c6a92..25401d9 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -9,7 +9,7 @@
 #ifndef __CYCLEGRAPH_H__
 #define __CYCLEGRAPH_H__
 
-#include "stl_wrappers.h"
+#include <vector>
 #include <inttypes.h>
 #include <stdio.h>
 
@@ -21,7 +21,7 @@ class Promise;
 class CycleNode;
 class ModelAction;
 
-typedef model_vector< const Promise * > promise_list_t;
+typedef std::vector< const Promise *, ModelAlloc<const Promise *> > promise_list_t;
 
 /** @brief A graph of Model Actions for tracking cycles. */
 class CycleGraph {
@@ -68,7 +68,7 @@ class CycleGraph {
 	bool mergeNodes(CycleNode *node1, CycleNode *node2);
 
 	HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
-	model_vector< const CycleNode * > * queue;
+	std::vector< const CycleNode *, ModelAlloc<const CycleNode *> > * queue;
 
 
 	/** @brief A table for mapping ModelActions to CycleNodes */