X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readtree.cpp;fp=readtree.cpp;h=f72d69821f56d8fa8fb90d098f71ca855bb08126;hb=260ae19c36cb11a53ddc5a75b5e507f8dd8b31d6;hp=1dd77f9152b241321f6658d0e0efc025c01a1a71;hpb=d84bb41d7dadcfa2c67ce5edb9b94060e5659fa7;p=mothur.git diff --git a/readtree.cpp b/readtree.cpp index 1dd77f9..f72d698 100644 --- a/readtree.cpp +++ b/readtree.cpp @@ -25,7 +25,7 @@ ReadTree::ReadTree() { int ReadTree::readSpecialChar(istream& f, char c, string name) { try { - gobble(f); + m->gobble(f); char d = f.get(); if(d == EOF){ @@ -37,7 +37,7 @@ int ReadTree::readSpecialChar(istream& f, char c, string name) { exit(1); } if(d == ')' && f.peek() == '\n'){ - gobble(f); + m->gobble(f); } return d; } @@ -51,7 +51,7 @@ int ReadTree::readSpecialChar(istream& f, char c, string name) { int ReadTree::readNodeChar(istream& f) { try { // while(isspace(d=f.get())) {;} - gobble(f); + m->gobble(f); char d = f.get(); if(d == EOF){ @@ -76,7 +76,7 @@ float ReadTree::readBranchLength(istream& f) { m->mothurOut("Error: Missing branch length in input tree.\n"); exit(1); } - gobble(f); + m->gobble(f); return b; } catch(exception& e) { @@ -125,7 +125,7 @@ int ReadNewickTree::read() { //save trees for later commands globaldata->gTree.push_back(T); - gobble(filehandle); + m->gobble(filehandle); } //if you are a nexus file }else if ((c = filehandle.peek()) == '#') {