Merge remote-tracking branch 'mothur/master'

[mothur.git] / trimflowscommand.h

diff --git a/trimflowscommand.h b/trimflowscommand.h
index 8656fd0b5b314084c6fd08cf614288aca2bbc763..27bafd530cad4a66ef22e41696eef7e2328bde97 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;
        
@@ -71,6 +72,8 @@ private:
        map<string, int> barcodes;
        map<string, int> primers;
        vector<string> revPrimer;
+    vector<string> linker;
+    vector<string> spacer;
 
        vector<string> primerNameVector;        //needed here?
        vector<string> barcodeNameVector;       //needed here?
@@ -131,7 +134,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;