fixes while testing 1.33.0

[mothur.git] / consensus.cpp

diff --git a/consensus.cpp b/consensus.cpp
index 1be052f3aee81f6f0aded053de8249dd958118dd..d45a395604148c398f0f7c5a3d379476e3bdda97 100644 (file)
--- a/consensus.cpp
+++ b/consensus.cpp
@@ -21,7 +21,7 @@ Tree* Consensus::getTree(vector<Tree*>& t){
                
                if (m->control_pressed) { return 0; }
                
-               consensusTree = new Tree(t[0]->getTreeMap());
+               consensusTree = new Tree(t[0]->getCountTable());
                
                it2 = nodePairs.find(treeSet);
                
@@ -37,8 +37,7 @@ Tree* Consensus::getTree(vector<Tree*>& t){
                
                if (m->control_pressed) {  delete consensusTree; return 0; }
                
-        map<string, string> empty;
-               consensusTree->assembleTree(empty);
+               consensusTree->assembleTree();
                
                if (m->control_pressed) {  delete consensusTree; return 0; }