From 5ddcbf32f5bd63e34d9853bf821514e487c77d74 Mon Sep 17 00:00:00 2001 From: Sarah Westcott Date: Wed, 20 Jul 2016 12:45:19 -0400 Subject: [PATCH] Fixes while building Windows --- source/commands/chimerauchimecommand.h | 14 +++++++------- source/mothurout.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/commands/chimerauchimecommand.h b/source/commands/chimerauchimecommand.h index c2075309..032c6c90 100644 --- a/source/commands/chimerauchimecommand.h +++ b/source/commands/chimerauchimecommand.h @@ -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 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; } diff --git a/source/mothurout.cpp b/source/mothurout.cpp index 3331cdf6..86d9e528 100644 --- a/source/mothurout.cpp +++ b/source/mothurout.cpp @@ -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;