fixes while testing 1.33.0

[mothur.git] / otuhierarchycommand.h

diff --git a/otuhierarchycommand.h b/otuhierarchycommand.h
index cd106ece49d90dcfe28a0d272b672919281a912b..2b9e8e7f042e5f63a8805a427a8c3f8693f6cad9 100644 (file)
--- a/otuhierarchycommand.h
+++ b/otuhierarchycommand.h
@@ -37,11 +37,12 @@ public:
        
 private:
        bool abort;
-       set<string> labels; //holds labels to be used
-       string label, listFile, outputDir, output;
+       set<string> mylabels; //holds labels to be used
+       string label, listFile, outputDir, output, list1Label, list2Label;
        vector<string> outputNames;
        
-       vector<ListVector> getListVectors();
+       vector< vector<string> > getListVectors();
+    vector< vector<string> > getListVector(string, string&);
                
 };