malloc: add exception info to function header

[c11tester.git] / tree.cc

diff --git a/tree.cc b/tree.cc
index 37dfa2698bb7aec3aad7f17f3280bd03400ddfa5..16a0b69a96c9248308626698ffbecd7cbf91de87 100644 (file)
--- a/tree.cc
+++ b/tree.cc
@@ -13,10 +13,9 @@ TreeNode::~TreeNode() {
 
        for (it = children.begin(); it != children.end(); it++)
                delete it->second;
-       delete &children;
 }
 
-TreeNode *TreeNode::exploreChild(tree_t id)
+TreeNode * TreeNode::exploreChild(tree_t id)
 {
        TreeNode *n;
        std::set<tree_t >::iterator it;
@@ -35,7 +34,7 @@ TreeNode *TreeNode::exploreChild(tree_t id)
 
 int TreeNode::setBacktrack(tree_t id)
 {
-       if (backtrack.find(id) == backtrack.end())
+       if (backtrack.find(id) != backtrack.end())
                return 1;
        backtrack.insert(id);
        return 0;
@@ -44,11 +43,11 @@ int TreeNode::setBacktrack(tree_t id)
 tree_t TreeNode::getNextBacktrack()
 {
        if (backtrack.empty())
-               return NULL;
+               return TREE_T_NONE;
        return *backtrack.begin();
 }
 
-TreeNode *TreeNode::getRoot()
+TreeNode * TreeNode::getRoot()
 {
        if (parent)
                return parent->getRoot();