X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=phylodiversitycommand.cpp;fp=phylodiversitycommand.cpp;h=d273e1dd3f4aab843190aceb4888e547a8bd81f5;hb=19fcbbdba99658f5eca244803280f9ee7f9f6607;hp=abb12435b0a414cf3bcea5f69505ba263fe733de;hpb=65b6a38d00b3a72021611211e7c25392022c69ed;p=mothur.git diff --git a/phylodiversitycommand.cpp b/phylodiversitycommand.cpp index abb1243..d273e1d 100644 --- a/phylodiversitycommand.cpp +++ b/phylodiversitycommand.cpp @@ -257,7 +257,7 @@ int PhyloDiversityCommand::execute(){ if (m->control_pressed) { delete tmap; for (int i = 0; i < trees.size(); i++) { delete trees[i]; } - for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } outputTypes.clear(); + for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } outputTypes.clear(); m->Groups.clear(); return 0; } @@ -288,7 +288,7 @@ int PhyloDiversityCommand::execute(){ //for each of the users trees for(int i = 0; i < trees.size(); i++) { - if (m->control_pressed) { delete tmap; for (int j = 0; j < trees.size(); j++) { delete trees[j]; } for (int j = 0; j < outputNames.size(); j++) { remove(outputNames[j].c_str()); } return 0; } + if (m->control_pressed) { delete tmap; for (int j = 0; j < trees.size(); j++) { delete trees[j]; } for (int j = 0; j < outputNames.size(); j++) { m->mothurRemove(outputNames[j]); } return 0; } ofstream outSum, outRare, outCollect; string outSumFile = outputDir + m->getRootName(m->getSimpleName(treefile)) + toString(i+1) + ".phylodiv.summary"; @@ -377,7 +377,7 @@ int PhyloDiversityCommand::execute(){ } - if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } return 0; } + if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; } m->mothurOutEndLine(); m->mothurOut("Output File Names: "); m->mothurOutEndLine(); @@ -467,7 +467,7 @@ int PhyloDiversityCommand::createProcesses(vector& procIters, Tree* t, map< } in.close(); - remove(inTemp.c_str()); + m->mothurRemove(inTemp); } #endif