From bd8b93fdff93ff7b2b7e493a7bcef6a59f299dae Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 27 Aug 2015 13:08:02 +0200 Subject: make PostUserEvent Link<> typed Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a --- vcl/source/helper/evntpost.cxx | 4 ++-- vcl/source/helper/threadex.cxx | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'vcl/source/helper') diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx index d278e9aa71b0..ce84ec74cba2 100644 --- a/vcl/source/helper/evntpost.cxx +++ b/vcl/source/helper/evntpost.cxx @@ -46,12 +46,12 @@ void EventPoster::Post( UserEvent* pEvent ) m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), pEvent ); } -IMPL_LINK( EventPoster, DoEvent_Impl, UserEvent*, pEvent ) +IMPL_LINK_TYPED( EventPoster, DoEvent_Impl, void*, p, void ) { + UserEvent* pEvent = static_cast(p); DBG_TESTSOLARMUTEX(); m_nId = 0; m_aLink.Call( pEvent ); - return 0; } } diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index a62bcfc3ab88..5fe7376c6556 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -36,7 +36,7 @@ SolarThreadExecutor::~SolarThreadExecutor() osl_destroyCondition( m_aFinish ); } -IMPL_LINK_NOARG(SolarThreadExecutor, worker) +IMPL_LINK_NOARG_TYPED(SolarThreadExecutor, worker, void*, void) { if ( !m_bTimeout ) { @@ -44,7 +44,6 @@ IMPL_LINK_NOARG(SolarThreadExecutor, worker) m_nReturn = doIt(); osl_setCondition( m_aFinish ); } - return m_nReturn; } long SolarThreadExecutor::impl_execute( const TimeValue* _pTimeout ) -- cgit v1.2.3