X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=pintail.cpp;h=9f46cf97a5611a7f5667ac9f6c46551629e7ca02;hb=60928795782d8f8648ec373d6a96b53032a77429;hp=af64c25ce290a808a5edc8295645bc16bf277856;hpb=b9553248b33ebd169c6aee375c1cc1a9dda61848;p=mothur.git diff --git a/pintail.cpp b/pintail.cpp index af64c25..9f46cf9 100644 --- a/pintail.cpp +++ b/pintail.cpp @@ -74,7 +74,7 @@ int Pintail::doPrep() { #ifdef USE_MPI //do nothing #else - #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) + #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) //find breakup of templatefile for quantiles if (processors == 1) { templateLines.push_back(new linePair(0, templateSeqs.size())); } else { @@ -529,7 +529,7 @@ Sequence* Pintail::findPairs(Sequence* q) { //************************************************************************************************** void Pintail::createProcessesQuan() { try { -#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) +#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) int process = 1; vector processIDS; @@ -546,7 +546,7 @@ void Pintail::createProcessesQuan() { //write out data to file so parent can read it ofstream out; - string s = toString(getpid()) + ".temp"; + string s = m->mothurGetpid(process) + ".temp"; m->openOutputFile(s, out); //output observed distances