X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=EM.cpp;h=684d639271567df55dcfc785d196e0f7df075694;hb=7777bfc71742d4e239d1297d2e3de058895f4ce1;hp=0d3872836784bcf45c9def4ae8ea09db6c4a7ef7;hpb=509ffe2d71cf6a6f5cca8c39909f8ee10b8db899;p=rsem.git

diff --git a/EM.cpp b/EM.cpp
index 0d38728..684d639 100644
--- a/EM.cpp
+++ b/EM.cpp
@@ -423,7 +423,6 @@ void EM() {
 	Params fparams[nThreads];
 	pthread_t threads[nThreads];
 	pthread_attr_t attr;
-	void *status;
 	int rc;
 
 
@@ -471,7 +470,7 @@ void EM() {
 		}
 
 		for (int i = 0; i < nThreads; i++) {
-			rc = pthread_join(threads[i], &status);
+			rc = pthread_join(threads[i], NULL);
 			pthread_assert(rc, "pthread_join", "Cannot join thread " + itos(i) + " (numbered from 0) at ROUND " + itos(ROUND) + "!");
 		}
 
@@ -521,7 +520,7 @@ void EM() {
 				pthread_assert(rc, "pthread_create", "Cannot create thread " + itos(i) + " (numbered from 0) when generating files for Gibbs sampler!");
 			}
 			for (int i = 0; i < nThreads; i++) {
-				rc = pthread_join(threads[i], &status);
+				rc = pthread_join(threads[i], NULL);
 				pthread_assert(rc, "pthread_join", "Cannot join thread " + itos(i) + " (numbered from 0) when generating files for Gibbs sampler!");
 			}
 		}
@@ -581,7 +580,7 @@ void EM() {
 		pthread_assert(rc, "pthread_create", "Cannot create thread " + itos(i) + " (numbered from 0) when calculating expected weights!");
 	}
 	for (int i = 0; i < nThreads; i++) {
-		rc = pthread_join(threads[i], &status);
+		rc = pthread_join(threads[i], NULL);
 		pthread_assert(rc, "pthread_join", "Cannot join thread " + itos(i) + " (numbered from 0) when calculating expected weights!");
 	}
 	model.setNeedCalcConPrb(false);