X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=matrixoutputcommand.cpp;h=35a45532dc64d8d11ab415e777b3afe67ae94057;hb=19fcbbdba99658f5eca244803280f9ee7f9f6607;hp=780091027a66340b5ac94ff9480c792cba18281b;hpb=65b6a38d00b3a72021611211e7c25392022c69ed;p=mothur.git

diff --git a/matrixoutputcommand.cpp b/matrixoutputcommand.cpp
index 7800910..35a4553 100644
--- a/matrixoutputcommand.cpp
+++ b/matrixoutputcommand.cpp
@@ -335,7 +335,7 @@ int MatrixOutputCommand::execute(){
 		//as long as you are not at the end of the file or done wih the lines you want
 		while((lookup[0] != NULL) && ((allLines == 1) || (userLabels.size() != 0))) {
 		
-			if (m->control_pressed) { outputTypes.clear(); delete input; for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str()); } m->Groups.clear(); return 0;  }
+			if (m->control_pressed) { outputTypes.clear(); delete input; for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]); } m->Groups.clear(); return 0;  }
 		
 			if(allLines == 1 || labels.count(lookup[0]->getLabel()) == 1){			
 				m->mothurOut(lookup[0]->getLabel()); m->mothurOutEndLine();
@@ -368,7 +368,7 @@ int MatrixOutputCommand::execute(){
 			lookup = input->getSharedRAbundVectors();
 		}
 		
-		if (m->control_pressed) { outputTypes.clear(); delete input; for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str()); } m->Groups.clear(); return 0;  }
+		if (m->control_pressed) { outputTypes.clear(); delete input; for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]); } m->Groups.clear(); return 0;  }
 
 		//output error messages about any remaining user labels
 		set<string>::iterator it;
@@ -383,7 +383,7 @@ int MatrixOutputCommand::execute(){
 			}
 		}
 		
-		if (m->control_pressed) { outputTypes.clear(); delete input;  for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str()); } m->Groups.clear(); return 0;  }
+		if (m->control_pressed) { outputTypes.clear(); delete input;  for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]); } m->Groups.clear(); return 0;  }
 
 		//run last label if you need to
 		if (needToRun == true)  {
@@ -395,7 +395,7 @@ int MatrixOutputCommand::execute(){
 			for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } 
 		}
 		
-		if (m->control_pressed) { outputTypes.clear();  delete input;  for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str()); } m->Groups.clear(); return 0;  }
+		if (m->control_pressed) { outputTypes.clear();  delete input;  for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]); } m->Groups.clear(); return 0;  }
 		
 		//reset groups parameter
 		m->Groups.clear();  
@@ -527,7 +527,7 @@ int MatrixOutputCommand::process(vector<SharedRAbundVector*> thisLookup){
 					}
 				}
 				intemp.close();
-				remove(tempdistFileName.c_str());
+				m->mothurRemove(tempdistFileName);
 			}
 			
 		}