From 9af8f190ed1bf3f76897ad0c078db16451d6fb69 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 22 Jan 2018 13:11:34 +0100 Subject: More loplugin:cstylecast on Windows Automatic rewrite (of loplugin:cstylecast and loplugin:unnecessaryparen) after cab0427cadddb3aaf1349c66f2fa13a4234ba4b2 "Enable loplugin:cstylecast for some more cases" and a409d32e7f6fc09e041079d6dbc3c927497adfed "More loplugin:cstylecast" Change-Id: Ib3355159dd08333e1b7a8d091caf2069cdcc7862 Reviewed-on: https://gerrit.libreoffice.org/48317 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx | 2 +- bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bridges') diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx index 36efe8e17289..7c754a6c37b6 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx @@ -380,7 +380,7 @@ unsigned char * codeSnippet( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset ) { - sal_uInt64 nOffsetAndIndex = ( ( (sal_uInt64) nVtableOffset ) << 32 ) | ( (sal_uInt64) nFunctionIndex ); + sal_uInt64 nOffsetAndIndex = ( static_cast(nVtableOffset) << 32 ) | static_cast(nFunctionIndex); unsigned char *p = code; // Spill parameters diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 640455b8bab9..02d78d740e80 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -645,7 +645,7 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw () // Fill pCode with D-Tor code GenerateDestructorTrampoline(pCode, pTD); - _pDtor = (sal_Int32)(reinterpret_cast(pCode) - _codeBase); + _pDtor = static_cast(reinterpret_cast(pCode) - _codeBase); pCodeOffset += codeSnippetSize; // Info count accompanied by type info ptrs: type, base type, base base type, ... -- cgit