diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:13:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:13:01 +0100 |
| commit | 8456c2ba408b3bed160d3e5f050738301b225bd5 (patch) | |
| tree | f5b4ba22b4c1e1ccfef3c5430b627ffd0bfc9ec7 /include/tools/solar.h | |
| parent | 8af176d7776938249f6e59dee3ed4f5c05edbebc (diff) | |
More loplugin:cstylecast: tools
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files
Change-Id: Ifb9ebc9623c8df14ea0d4c907001bd16c5b9ae59
Diffstat (limited to 'include/tools/solar.h')
| -rw-r--r-- | include/tools/solar.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/tools/solar.h b/include/tools/solar.h index a1b10d6e9f01..9ee55c4ad5de 100644 --- a/include/tools/solar.h +++ b/include/tools/solar.h @@ -47,13 +47,13 @@ typedef sal_uInt8 SVBT64[8]; #ifdef __cplusplus inline sal_uInt16 SVBT16ToShort( const SVBT16 p ) { return static_cast<sal_uInt16> - ((sal_uInt16)p[0] - + ((sal_uInt16)p[1] << 8)); } + (static_cast<sal_uInt16>(p[0]) + + (static_cast<sal_uInt16>(p[1]) << 8)); } inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return static_cast<sal_uInt32> - ((sal_uInt32)p[0] - + ((sal_uInt32)p[1] << 8) - + ((sal_uInt32)p[2] << 16) - + ((sal_uInt32)p[3] << 24)); } + (static_cast<sal_uInt32>(p[0]) + + (static_cast<sal_uInt32>(p[1]) << 8) + + (static_cast<sal_uInt32>(p[2]) << 16) + + (static_cast<sal_uInt32>(p[3]) << 24)); } #if defined OSL_LITENDIAN inline double SVBT64ToDouble( const SVBT64 p ) { double n; reinterpret_cast<sal_uInt8*>(&n)[0] = p[0]; @@ -78,12 +78,12 @@ inline double SVBT64ToDouble( const SVBT64 p ) { double n; return n; } #endif -inline void ShortToSVBT16( sal_uInt16 n, SVBT16 p ) { p[0] = (sal_uInt8) n; - p[1] = (sal_uInt8)(n >> 8); } -inline void UInt32ToSVBT32 ( sal_uInt32 n, SVBT32 p ) { p[0] = (sal_uInt8) n; - p[1] = (sal_uInt8)(n >> 8); - p[2] = (sal_uInt8)(n >> 16); - p[3] = (sal_uInt8)(n >> 24); } +inline void ShortToSVBT16( sal_uInt16 n, SVBT16 p ) { p[0] = static_cast<sal_uInt8>(n); + p[1] = static_cast<sal_uInt8>(n >> 8); } +inline void UInt32ToSVBT32 ( sal_uInt32 n, SVBT32 p ) { p[0] = static_cast<sal_uInt8>(n); + p[1] = static_cast<sal_uInt8>(n >> 8); + p[2] = static_cast<sal_uInt8>(n >> 16); + p[3] = static_cast<sal_uInt8>(n >> 24); } #if defined OSL_LITENDIAN inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = reinterpret_cast<sal_uInt8*>(&n)[0]; p[1] = reinterpret_cast<sal_uInt8*>(&n)[1]; |