summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-28 19:08:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-28 19:09:27 +0100
commit9826b9cf5b8c78fe25eaab1009e0c95142678ecb (patch)
tree0bd7d583c44dbaa30eca8619ef5dae681aede302 /include
parent93a8ef5a2d3b23b193261177eee4fb13758dd7cc (diff)
Clean up C-style casts from pointers to void
Change-Id: Ife048a705e899870a8b1d9987b109d5c0cd80599
Diffstat (limited to 'include')
-rw-r--r--include/tools/debug.hxx2
-rw-r--r--include/tools/link.hxx6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index c8ce86f27061..4b0ee11434d9 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -61,7 +61,7 @@ TOOLS_DLLPUBLIC void* DbgFunc( sal_uInt16 nAction, void* pData = NULL );
inline DbgData* DbgGetData()
{
- return (DbgData*)DbgFunc( DBG_FUNC_GETDATA );
+ return static_cast<DbgData*>(DbgFunc( DBG_FUNC_GETDATA ));
}
inline void DbgSaveData( const DbgData& rData )
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index c14eb010356c..566927c80efa 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -45,20 +45,20 @@ typedef sal_IntPtr (*PSTUB)( void*, void* );
#define IMPL_STUB(Class, Method, ArgType) \
sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
{ \
- return static_cast<Class*>(pThis)->Method( (ArgType)pCaller ); \
+ return static_cast<Class*>(pThis)->Method( static_cast<ArgType>(pCaller) ); \
}
#define IMPL_STATIC_LINK( Class, Method, ArgType, ArgName ) \
sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
{ \
- return Method( static_cast<Class*>(pThis), (ArgType)pCaller ); \
+ return Method( static_cast<Class*>(pThis), static_cast<ArgType>(pCaller) ); \
} \
sal_IntPtr Class::Method( Class* pThis, ArgType ArgName )
#define IMPL_STATIC_LINK_NOINSTANCE( Class, Method, ArgType, ArgName ) \
sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
{ \
- return Method( static_cast<Class*>(pThis), (ArgType)pCaller ); \
+ return Method( static_cast<Class*>(pThis), static_cast<ArgType>(pCaller) ); \
} \
sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER Class*, ArgType ArgName )