merged pat's trim seqs edits with sarah's major overhaul of global data; also added...

[mothur.git] / sequence.cpp

diff --git a/sequence.cpp b/sequence.cpp
index 6a15eb5f7d23f93272811a975beedc649a0d9ce9..580f68ae7706ed15a11f9f460e29a56bd441767b 100644 (file)
--- a/sequence.cpp
+++ b/sequence.cpp
@@ -34,10 +34,9 @@ Sequence::Sequence(ifstream& fastaFile){
        initialize();
        fastaFile >> name;
        name = name.substr(1);
-       char c;
-       
-       while ((c = fastaFile.get()) != EOF)    {       if (c == 10){   break;  }       } // get rest of line if there's any crap there
        
+       while (!fastaFile.eof())        {       char c = fastaFile.get(); if (c == 10 || c == 13){      break;  }       } // get rest of line if there's any crap there
+
        char letter;
        string sequence;