changed reading of name file to use buffered reads. note the splitAtWhiteSpace functi...

[mothur.git] / screenseqscommand.h

diff --git a/screenseqscommand.h b/screenseqscommand.h
index 007b6d6302d4062c09c62d9017fa663f3a902072..54c8fbb76a9f8db6d200b02feb2e28ce106682d0 100644 (file)
--- a/screenseqscommand.h
+++ b/screenseqscommand.h
@@ -60,7 +60,6 @@ private:
        vector<string> outputNames;
        vector<string> optimize;
        map<string, int> nameMap;
-       int readNames();
        
        int getSummary(vector<unsigned long long>&);
        int createProcessesCreateSummary(vector<int>&, vector<int>&, vector<int>&, vector<int>&, vector<int>&, string);
@@ -107,11 +106,11 @@ struct sumScreenData {
        int count;
        MothurOut* m;
        string goodFName, badAccnosFName, filename;
-    set<string>* badSeqNames;
+    set<string> badSeqNames;
        
        
        sumScreenData(){}
-       sumScreenData(int s, int e, int a, int h, int minl, int maxl, string f, MothurOut* mout, unsigned long long st, unsigned long long en, string gf, string bf, set<string>* bn) {
+       sumScreenData(int s, int e, int a, int h, int minl, int maxl, string f, MothurOut* mout, unsigned long long st, unsigned long long en, string gf, string bf) {
                startPos = s;
                endPos = e;
                minLength = minl;
@@ -124,14 +123,13 @@ struct sumScreenData {
                m = mout;
                start = st;
                end = en;
-               badSeqNames = bn;
                count = 0;
        }
 };
 
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MySumThreadFunction(LPVOID lpParam){ 
        sumData* pDataArray;
@@ -233,7 +231,7 @@ static DWORD WINAPI MySumScreenThreadFunction(LPVOID lpParam){
                                }
                                else{
                                        badAccnosFile << currSeq.getName() << endl;
-                                       pDataArray->badSeqNames->insert(currSeq.getName());
+                                       pDataArray->badSeqNames.insert(currSeq.getName());
                                }
     
                        }