]> git.donarmstrong.com Git - mothur.git/commitdiff
fixed linking error in collect, collectshared, and errorcheckor
authorwestcott <westcott>
Thu, 19 Feb 2009 13:51:33 +0000 (13:51 +0000)
committerwestcott <westcott>
Thu, 19 Feb 2009 13:51:33 +0000 (13:51 +0000)
collectcommand.cpp
collectsharedcommand.cpp
errorchecking.cpp

index c716732474da857a38bee138931b4a769cca4aa1..95a79d5bc69f763688915ecb998bd47cff162f1e 100644 (file)
@@ -110,7 +110,6 @@ int CollectCommand::execute(){
                for(i = globaldata->labels.begin(); i != globaldata->labels.end(); ++i)
                        if(orderList.count(*i) == 0)
                                cout << "'" << *i << "'" << " is not a valid label.\n";
-               globaldata->clearLabels();
                for(int i=0;i<cDisplays.size();i++){    delete cDisplays[i];    }       
                return 0;
        }
index b3f798145bc4de3abe460aa0e8dbccd8825178c6..8c04545d61fc321382122526bc53e4c2892321eb 100644 (file)
@@ -142,7 +142,6 @@ int CollectSharedCommand::execute(){
                for(i = globaldata->labels.begin(); i != globaldata->labels.end(); ++i)
                        if(orderList.count(*i) == 0)
                                cout << "'" << *i << "'" << " is not a valid label.\n";
-               globaldata->clearLabels();
                for(int i=0;i<cDisplays.size();i++){    delete cDisplays[i];    }       
                return 0;
        }
index ddcfc32b7b2163b5e8477bcc577b0bde52ef013f..54465729f5e04c36c6a0e2bed16064a5ea32b9a2 100644 (file)
@@ -409,8 +409,6 @@ bool ErrorCheck::checkInput(string input) {
                        }
                }
 
-               globaldata->clearAbund();
-
                return errorFree;
 }