[mpich2-commits] r6708 - mpich2/trunk/src/mpid/common/thread

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2010-05-24 10:38:27 -0500 (Mon, 24 May 2010)
New Revision: 6708

Modified:
   mpich2/trunk/src/mpid/common/thread/mpe_funcs.i
Log:
Explicitly cast away the type of the values in mpe tls set/get. This fix is reqd for windows builds after r6664

Modified: mpich2/trunk/src/mpid/common/thread/mpe_funcs.i
===================================================================
--- mpich2/trunk/src/mpid/common/thread/mpe_funcs.i	2010-05-24 15:38:05 UTC (rev 6707)
+++ mpich2/trunk/src/mpid/common/thread/mpe_funcs.i	2010-05-24 15:38:27 UTC (rev 6708)
@@ -172,13 +172,13 @@
 #if !defined(MPID_THREAD_DEBUG)
 #define MPID_Thread_tls_set(tls_, value_)	\
 do {                                               \
-    MPIU_Thread_tls_set((tls_), (value_), NULL);	\
+    MPIU_Thread_tls_set((tls_), (void *)(value_), NULL);	\
 } while (0)
 #else
 #define MPID_Thread_tls_set(tls_, value_)		\
 do {                                                       \
     int err_;						\
-    MPIU_Thread_tls_set((tls_), (value_), &err_);	\
+    MPIU_Thread_tls_set((tls_), (void *)(value_), &err_);	\
     MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,                                \
                         ("tls_set failed, err_=%d (%s)",err_,MPIU_Strerror(err_))); \
 } while (0)
@@ -187,14 +187,14 @@
 #if !defined(MPID_THREAD_DEBUG)
 #define MPID_Thread_tls_get(tls_, value_)	\
 do {                                               \
-    MPIU_Thread_tls_get((tls_), (value_), NULL);	\
+    MPIU_Thread_tls_get((tls_), (void **)(value_), NULL);	\
 } while (0)
 #else
 #define MPID_Thread_tls_get(tls_, value_)		\
 do {                                                       \
     int err_;						\
 							\
-    MPIU_Thread_tls_get((tls_), (value_), &err_);	\
+    MPIU_Thread_tls_get((tls_), (void **)(value_), &err_);	\
     /* can't strerror here, possible endless recursion in strerror */ \
     MPIU_Assert_fmt_msg(err_ == MPIU_THREAD_SUCCESS,("tls_get failed, err_=%d",err_)); \
 } while (0)