Permalink
Browse files

Fixes while building Windows

  • Loading branch information...
1 parent 88e0da2 commit 5ddcbf32f5bd63e34d9853bf821514e487c77d74 @mothur-westcott mothur-westcott committed Jul 20, 2016
Showing with 8 additions and 8 deletions.
  1. +7 −7 source/commands/chimerauchimecommand.h
  2. +1 −1 source/mothurout.cpp
@@ -203,11 +203,11 @@ static DWORD WINAPI MyUchimeThreadFunction(LPVOID lpParam){
string accnos = pDataArray->accnos+pDataArray->groups[i];
if (pDataArray->filename.length() > 257) {
- m->mothurOut("[ERROR]: " + pDataArray->filename + " filename is " + toString(pDataArray->filename.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct.\n"); m->control_pressed = true; return 0;
+ pDataArray->m->mothurOut("[ERROR]: " + pDataArray->filename + " filename is " + toString(pDataArray->filename.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct.\n"); pDataArray->m->control_pressed = true; return 0;
}else if ((pDataArray->alns.length() > 257) && (pDataArray->chimealns)) {
- m->mothurOut("[ERROR]: " + pDataArray->alns + " filename is " + toString(pDataArray->alns.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct.\n"); m->control_pressed = true; return 0;
+ pDataArray->m->mothurOut("[ERROR]: " + pDataArray->alns + " filename is " + toString(pDataArray->alns.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct.\n"); pDataArray->m->control_pressed = true; return 0;
}else if (pDataArray->outputFName.length() > 257) {
- m->mothurOut("[ERROR]: " + pDataArray->outputFName + " filename is " + toString(pDataArray->outputFName.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct input file name.\n"); m->control_pressed = true; return 0;
+ pDataArray->m->mothurOut("[ERROR]: " + pDataArray->outputFName + " filename is " + toString(pDataArray->outputFName.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct input file name.\n"); pDataArray->m->control_pressed = true; return 0;
}
vector<char*> cPara;
@@ -553,13 +553,13 @@ static DWORD WINAPI MyUchimeSeqsThreadFunction(LPVOID lpParam){
string accnos = pDataArray->accnos;
if (pDataArray->filename.length() > 257) {
- m->mothurOut("[ERROR]: " + pDataArray->filename + " filename is " + toString(pDataArray->filename.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct.\n"); m->control_pressed = true; return 0;
+ pDataArray->m->mothurOut("[ERROR]: " + pDataArray->filename + " filename is " + toString(pDataArray->filename.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct.\n"); pDataArray->m->control_pressed = true; return 0;
}else if ((pDataArray->alns.length() > 257) && (pDataArray->chimealns)) {
- m->mothurOut("[ERROR]: " + pDataArray->alns + " filename is " + toString(pDataArray->alns.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct.\n"); m->control_pressed = true; return 0;
+ pDataArray->m->mothurOut("[ERROR]: " + pDataArray->alns + " filename is " + toString(pDataArray->alns.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct.\n"); pDataArray->m->control_pressed = true; return 0;
}else if (pDataArray->outputFName.length() > 257) {
- m->mothurOut("[ERROR]: " + pDataArray->outputFName + " filename is " + toString(pDataArray->outputFName.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct input file name.\n"); m->control_pressed = true; return 0;
+ pDataArray->m->mothurOut("[ERROR]: " + pDataArray->outputFName + " filename is " + toString(pDataArray->outputFName.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct input file name.\n"); pDataArray->m->control_pressed = true; return 0;
}else if (pDataArray->templatefile.length() > 257) {
- m->mothurOut("[ERROR]: " + pDataArray->templatefile + " filename is " + toString(pDataArray->templatefile.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct input file name.\n"); m->control_pressed = true; return 0;
+ pDataArray->m->mothurOut("[ERROR]: " + pDataArray->templatefile + " filename is " + toString(pDataArray->templatefile.length()) + " long. The uchime program can't handle files with a full path longer than 257 characters, please correct input file name.\n"); pDataArray->m->control_pressed = true; return 0;
}
View
@@ -4372,7 +4372,7 @@ int MothurOut::getTimeStamp(string filename) {
if(hFile == INVALID_HANDLE_VALUE) {
mothurOut("[ERROR]: Can't find timestamp for " + filename + "\n"); control_pressed = true;
- return timestamp;
+ return timeStamp;
}
FILETIME ftCreate, ftAccess, ftWrite;

0 comments on commit 5ddcbf3

Please sign in to comment.