--- TreeLib/nodeiterator.h.old 2002-02-24 15:37:17.000000000 -0500 +++ TreeLib/nodeiterator.h 2005-02-27 14:23:30.971981368 -0500 @@ -128,34 +128,34 @@ template N *PreorderIterator::begin () { - cur = root; - return cur; + this->cur = this->root; + return this->cur; } template N *PreorderIterator::next () { - if (cur->GetChild()) + if (this->cur->GetChild()) { - stk.push (cur); - N *p = (N *)(cur->GetChild()); - cur = p; + this->stk.push (this->cur); + N *p = (N *)(this->cur->GetChild()); + this->cur = p; } else { - while (!stk.empty() && (cur->GetSibling() == NULL)) + while (!this->stk.empty() && (this->cur->GetSibling() == NULL)) { - cur = stk.top(); - stk.pop(); + this->cur = this->stk.top(); + this->stk.pop(); } - if (stk.empty()) - cur = NULL; + if (this->stk.empty()) + this->cur = NULL; else { - N *p = (N *)(cur->GetSibling()); - cur = p; + N *p = (N *)(this->cur->GetSibling()); + this->cur = p; } } - return cur; + return this->cur; } --- TreeLib/profile.h.old 2002-12-10 06:37:57.000000000 -0500 +++ TreeLib/profile.h 2005-02-27 14:27:51.205419872 -0500 @@ -77,7 +77,7 @@ #include #endif - +using namespace std; /** *@typedef std::map > LabelMap; --- TreeLib/treedrawer.cpp.old 2003-08-22 06:47:28.000000000 -0400 +++ TreeLib/treedrawer.cpp 2005-02-27 14:26:19.279394752 -0500 @@ -406,7 +406,7 @@ if (q->IsLeaf()) { double d = q->GetPathLength() - mMaxPathLength; - mUltrametric = (std::fabs(d) <= 0.0001); + mUltrametric = (fabs(d) <= 0.0001); // cout << mMaxPathLength << ":" << q->GetPathLength() << " " << d << endl; } q = u.next();