added mothurgetpid function. fixed bug with align.seqs related to g++ 4.8 change...

[mothur.git] / blastdb.cpp

diff --git a/blastdb.cpp b/blastdb.cpp
index 2eced7e14dc6fa42e0147747fc622bfa088250f7..a77880e5865130732f4860c9cd50dc11c91af6ce 100644 (file)
--- a/blastdb.cpp
+++ b/blastdb.cpp
@@ -23,14 +23,10 @@ gapOpen(gO), gapExtend(gE), match(mm), misMatch(mM) {
 
                int randNumber = rand();
                //int randNumber = 12345;
-               string pid = "";
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
-               pid += getpid();        
-#else
-               pid += toString(threadID);      
-#endif
-               
+               string pid = m->mothurGetpid(threadID);
                
+        if (m->debug) { m->mothurOut("[DEBUG]: tag = " + tag + "\t pid = " + pid + "\n"); }
+        
                dbFileName = tag + pid + toString(randNumber) + ".template.unaligned.fasta";
                queryFileName = tag + pid + toString(randNumber) + ".candidate.unaligned.fasta";
                blastFileName = tag + pid + toString(randNumber) + ".blast";
@@ -122,13 +118,7 @@ BlastDB::BlastDB(string b, int tid) : Database() {
                }
                
                int randNumber = rand();
-               string pid = "";
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
-               pid += getpid();        
-#else
-               pid += toString(threadID);      
-#endif
-               
+               string pid = m->mothurGetpid(threadID);
                dbFileName = pid + toString(randNumber) + ".template.unaligned.fasta";
                queryFileName = pid + toString(randNumber) + ".candidate.unaligned.fasta";
                blastFileName = pid + toString(randNumber) + ".blast";