include/tools/debug.hxx | 2 +- tools/source/debug/debug.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit c2a93a21a5a7af38ae659b9340beeb13c084eb12 Author: David Ostrovsky <da...@ostrovsky.org> Date: Mon Dec 8 08:19:15 2014 +0100 long is 32 bit on Windows x86_64 platform So that this is always wrong (on this platform) to write: reinterpret_cast<foo>(reinterpret_cast<long>(bar)) it should be: renterpret_cast<foo>(reinterpret_cast<sal_uIntPtr>(bar)) Change-Id: Ia286246ee1616988f755c2d2054b26efacc51af0 Reviewed-on: https://gerrit.libreoffice.org/13366 Reviewed-by: Michael Stahl <mst...@redhat.com> Tested-by: Michael Stahl <mst...@redhat.com> diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx index 6e73d2e..cdbe081 100644 --- a/include/tools/debug.hxx +++ b/include/tools/debug.hxx @@ -98,7 +98,7 @@ inline sal_uIntPtr DbgIsBoldAppFont() inline void DbgSetTestSolarMutex( DbgTestSolarMutexProc pProc ) { - DbgFunc( DBG_FUNC_SETTESTSOLARMUTEX, reinterpret_cast<void*>(reinterpret_cast<long>(pProc)) ); + DbgFunc( DBG_FUNC_SETTESTSOLARMUTEX, reinterpret_cast<void*>(reinterpret_cast<sal_uIntPtr>(pProc)) ); } #define DBG_ASSERTWARNING( sCon, aWarning ) \ diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index 274d116..9e65c44 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -288,7 +288,7 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam ) break; case DBG_FUNC_SETTESTSOLARMUTEX: - pDebugData->pDbgTestSolarMutex = reinterpret_cast<DbgTestSolarMutexProc>(reinterpret_cast<long>(pParam)); + pDebugData->pDbgTestSolarMutex = reinterpret_cast<DbgTestSolarMutexProc>(reinterpret_cast<sal_uIntPtr>(pParam)); break; case DBG_FUNC_TESTSOLARMUTEX: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits