X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tree.cpp;h=6b799f479d12dd13da3e1579c19167dda056ba43;hb=67ea6ccd74dbd64828d31b952808255f206364ff;hp=0bd98e01f1c305d93851e1a5e465c92a22fc9a1f;hpb=90708fe9701e3827e477c82fb3652539c3bf2a0d;p=mothur.git diff --git a/tree.cpp b/tree.cpp index 0bd98e0..6b799f4 100644 --- a/tree.cpp +++ b/tree.cpp @@ -1344,7 +1344,7 @@ int Tree::readTreeString(ifstream& filehandle) { c = filehandle.get(); //k = c; //cout << k << endl; - while ((c != '(') && (c != ')') && (c != ',') && (c != ':') && (c != '\n') && (c != 32) && (c != '\t')) { + while ((c != '(') && (c != ')') && (c != ',') && (c != ':') && (c != '\n') && (c != 32) && (c != '\t')) { name += c; c = filehandle.get(); //k = c; @@ -1352,7 +1352,9 @@ int Tree::readTreeString(ifstream& filehandle) { } //cout << "name = " << name << endl; - m->Treenames.push_back(name); + if (name != "\r" ) { + m->Treenames.push_back(name); } //cout << m->Treenames.size() << '\t' << name << endl; + filehandle.putback(c); //k = c; //cout << " after putback" << k << endl;