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

[mothur.git] / myseqdist.cpp

diff --git a/myseqdist.cpp b/myseqdist.cpp
index f5c8b40cd81d9d06a65a861c1e0e66355b275f58..b43af1cfeb7b86dae7e17646f983f1cae1c51287 100644 (file)
--- a/myseqdist.cpp
+++ b/myseqdist.cpp
@@ -46,7 +46,7 @@ int correctDist::addSeq(string seqName, string seqSeq){
 /**************************************************************************************************/
 int correctDist::execute(string distanceFileName){
        try {
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
                processors = 1;
 #endif
@@ -146,7 +146,7 @@ vector<int> correctDist::fixSequence(string sequence){
 
 int correctDist::createProcess(string distanceFileName){
        try {
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                int process = 1;
                vector<int> processIDs;
                
@@ -159,7 +159,7 @@ int correctDist::createProcess(string distanceFileName){
                                process++;
                        }
                        else if(pid == 0){
-                               driver(start[process], end[process], distanceFileName + toString(getpid()) + ".temp");
+                               driver(start[process], end[process], distanceFileName + m->mothurGetpid(process) + ".temp");
                                exit(0);
                        }
                        else{
@@ -219,11 +219,11 @@ int correctDist::driver(int start, int end, string distFileName){
                        }
                        distFile << endl;
                        
-                       if(i % 100 == 0){ m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine(); }
+                       if(i % 100 == 0){ m->mothurOutJustToScreen(toString(i) + "\t" + toString(time(NULL) - startTime)+"\n"); }
                }
                distFile.close();
                
-               if((end-1) % 100 != 0){ m->mothurOut(toString(end-1) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine(); }
+               if((end-1) % 100 != 0){ m->mothurOutJustToScreen(toString(end-1) + "\t" + toString(time(NULL) - startTime)+"\n"); }
                m->mothurOut("Done.\n");
                
                return 0;