fix casting problem?
This commit is contained in:
@@ -41,12 +41,14 @@ uint64_t ThreadImpl_Pthreads::GetThreadId() const
|
|||||||
|
|
||||||
int ThreadImpl_Pthreads::Wait()
|
int ThreadImpl_Pthreads::Wait()
|
||||||
{
|
{
|
||||||
void *val;
|
int *val;
|
||||||
int ret = pthread_join( thread, &val );
|
int ret = pthread_join( thread, (void **) &val );
|
||||||
if( ret )
|
if( ret )
|
||||||
RageException::Throw( "pthread_join: %s", strerror(errno) );
|
RageException::Throw( "pthread_join: %s", strerror(errno) );
|
||||||
|
|
||||||
return (int) val;
|
int iRet = *val;
|
||||||
|
delete val;
|
||||||
|
return iRet;
|
||||||
}
|
}
|
||||||
|
|
||||||
ThreadImpl *MakeThisThread()
|
ThreadImpl *MakeThisThread()
|
||||||
@@ -69,7 +71,9 @@ static void *StartThread( void *pData )
|
|||||||
/* Tell MakeThread that we've set m_piThreadID, so it's safe to return. */
|
/* Tell MakeThread that we've set m_piThreadID, so it's safe to return. */
|
||||||
pThis->m_StartFinishedSem->Post();
|
pThis->m_StartFinishedSem->Post();
|
||||||
|
|
||||||
return (void *) pThis->m_pFunc( pThis->m_pData );
|
int iRet = pThis->m_pFunc( pThis->m_pData );
|
||||||
|
|
||||||
|
return new int(iRet);
|
||||||
}
|
}
|
||||||
|
|
||||||
ThreadImpl *MakeThread( int (*pFunc)(void *pData), void *pData, uint64_t *piThreadID )
|
ThreadImpl *MakeThread( int (*pFunc)(void *pData), void *pData, uint64_t *piThreadID )
|
||||||
|
|||||||
Reference in New Issue
Block a user