From: westcott <westcott> Date: Thu, 19 Feb 2009 13:51:33 +0000 (+0000) Subject: fixed linking error in collect, collectshared, and errorcheckor X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ec43347d04dbb2a7d9d9ecfb5fc556e21ad8c2bc;p=mothur.git fixed linking error in collect, collectshared, and errorcheckor --- diff --git a/collectcommand.cpp b/collectcommand.cpp index c716732..95a79d5 100644 --- a/collectcommand.cpp +++ b/collectcommand.cpp @@ -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; } diff --git a/collectsharedcommand.cpp b/collectsharedcommand.cpp index b3f7981..8c04545 100644 --- a/collectsharedcommand.cpp +++ b/collectsharedcommand.cpp @@ -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; } diff --git a/errorchecking.cpp b/errorchecking.cpp index ddcfc32..5446572 100644 --- a/errorchecking.cpp +++ b/errorchecking.cpp @@ -409,8 +409,6 @@ bool ErrorCheck::checkInput(string input) { } } - globaldata->clearAbund(); - return errorFree; }