added check to make sure shhh.flows child processes finish properly. added subsamplin...

[mothur.git] / trimflowscommand.h

diff --git a/trimflowscommand.h b/trimflowscommand.h
index 8c996dd9782734a5e9e209ecea4a57f1b1e1d333..414c73cd1d2e6740b89d5200a5c7e7c704097ed6 100644 (file)
--- a/trimflowscommand.h
+++ b/trimflowscommand.h
@@ -49,7 +49,8 @@ private:
        vector<unsigned long long> getFlowFileBreaks();
        int createProcessesCreateTrim(string, string, string, string, vector<vector<string> >); 
        int driverCreateTrim(string, string, string, string, vector<vector<string> >, linePair*);
-
+    string reverseOligo(string);
+    
        vector<string> outputNames;
        set<string> filesToRemove;
        
@@ -66,7 +67,6 @@ private:
        
        string flowFileName, oligoFileName, outputDir;
 
-
        map<string, int> barcodes;
        map<string, int> primers;
        vector<string> revPrimer;
@@ -132,7 +132,7 @@ struct trimFlowData {
 };
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MyTrimFlowThreadFunction(LPVOID lpParam){ 
        trimFlowData* pDataArray;