Adding STL stuff and operator news of snapshot to model-checker. Need to actuallly...

[c11tester.git] / tree.h

diff --git a/tree.h b/tree.h
index 864ce8f45aad5fc8cb885492420ea408881cba69..e107a7ef76f1d2805d7f1005e1313b1fc1184750 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -1,6 +1,6 @@
 #ifndef __TREE_H__
 #define __TREE_H__
-
+#include "mymemory.h"
 #include <set>
 #include <map>
 #include <cstddef>
@@ -28,10 +28,11 @@ public:
        static int getTotalNodes() { return TreeNode::totalNodes; }
 
        bool is_enabled(Thread *t);
+  MEMALLOC
 private:
        TreeNode *parent;
-       std::map<int, class TreeNode *> children;
-       std::set<int> backtrack;
+       std::map<int, class TreeNode *, std::less< int >, MyAlloc< std::pair< const int, class TreeNode * > > > children;
+       std::set<int, std::less< int >, MyAlloc< int > > backtrack;
        static int totalNodes;
        int num_threads;
 };