model: bugfix - resize thrd_last_action when adding objects

[c11tester.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 37f9261149bc49a9d0a99182e21102be39e1161a..c09b628b4ffc9a8f91a7997f628f3234c1e6b7df 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -7,14 +7,13 @@
 
 #include <list>
 #include <vector>
-#include <set>
 #include <cstddef>
 #include "threads.h"
 #include "mymemory.h"
 
 class ModelAction;
 
-typedef std::set< ModelAction *, std::less< ModelAction *>, MyAlloc< ModelAction * > > action_set_t;
+typedef std::list< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
 
 /**
  * @brief A single node in a NodeStack
@@ -44,9 +43,10 @@ public:
         * occurred previously in the stack. */
        Node * get_parent() const { return parent; }
 
-       void add_read_from(ModelAction *act);
+       void add_read_from(const ModelAction *act);
 
        void print();
+       void print_may_read_from();
 
        MEMALLOC
 private:
@@ -61,10 +61,10 @@ private:
 
        /** The set of ModelActions that this the action at this Node may read
         *  from. Only meaningful if this Node represents a 'read' action. */
-       action_set_t may_read_from;
+       readfrom_set_t may_read_from;
 };
 
-typedef std::list<class Node *, MyAlloc< class Node * > > node_list_t;
+typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
 
 /**
  * @brief A stack of nodes