diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-18 21:37:25 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-20 09:06:52 +0100 |
| commit | 2850b4dc39069d128768084a67b24927f392448a (patch) | |
| tree | 8fddde4583a7ec37e23151106ada2777e6d79de5 /include | |
| parent | 17fe7fc590b999005a76475d62821f8ac63f2124 (diff) | |
Some more loplugin:cstylecast: tools
Change-Id: I2b540c4c0c34823143e13d16559dac7458a38933
Diffstat (limited to 'include')
| -rw-r--r-- | include/tools/solar.h | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/include/tools/solar.h b/include/tools/solar.h index f1ac0a784c30..c8d83ac4c4bc 100644 --- a/include/tools/solar.h +++ b/include/tools/solar.h @@ -55,25 +55,25 @@ inline sal_uInt32 SVBT32ToUInt32 ( const SVBT32 p ) { return (sal_uInt32)p[0] + ((sal_uInt32)p[3] << 24); } #if defined OSL_LITENDIAN inline double SVBT64ToDouble( const SVBT64 p ) { double n; - ((sal_uInt8*)&n)[0] = p[0]; - ((sal_uInt8*)&n)[1] = p[1]; - ((sal_uInt8*)&n)[2] = p[2]; - ((sal_uInt8*)&n)[3] = p[3]; - ((sal_uInt8*)&n)[4] = p[4]; - ((sal_uInt8*)&n)[5] = p[5]; - ((sal_uInt8*)&n)[6] = p[6]; - ((sal_uInt8*)&n)[7] = p[7]; + reinterpret_cast<sal_uInt8*>(&n)[0] = p[0]; + reinterpret_cast<sal_uInt8*>(&n)[1] = p[1]; + reinterpret_cast<sal_uInt8*>(&n)[2] = p[2]; + reinterpret_cast<sal_uInt8*>(&n)[3] = p[3]; + reinterpret_cast<sal_uInt8*>(&n)[4] = p[4]; + reinterpret_cast<sal_uInt8*>(&n)[5] = p[5]; + reinterpret_cast<sal_uInt8*>(&n)[6] = p[6]; + reinterpret_cast<sal_uInt8*>(&n)[7] = p[7]; return n; } #else inline double SVBT64ToDouble( const SVBT64 p ) { double n; - ((sal_uInt8*)&n)[0] = p[7]; - ((sal_uInt8*)&n)[1] = p[6]; - ((sal_uInt8*)&n)[2] = p[5]; - ((sal_uInt8*)&n)[3] = p[4]; - ((sal_uInt8*)&n)[4] = p[3]; - ((sal_uInt8*)&n)[5] = p[2]; - ((sal_uInt8*)&n)[6] = p[1]; - ((sal_uInt8*)&n)[7] = p[0]; + reinterpret_cast<sal_uInt8*>(&n)[0] = p[7]; + reinterpret_cast<sal_uInt8*>(&n)[1] = p[6]; + reinterpret_cast<sal_uInt8*>(&n)[2] = p[5]; + reinterpret_cast<sal_uInt8*>(&n)[3] = p[4]; + reinterpret_cast<sal_uInt8*>(&n)[4] = p[3]; + reinterpret_cast<sal_uInt8*>(&n)[5] = p[2]; + reinterpret_cast<sal_uInt8*>(&n)[6] = p[1]; + reinterpret_cast<sal_uInt8*>(&n)[7] = p[0]; return n; } #endif @@ -84,23 +84,23 @@ inline void UInt32ToSVBT32 ( sal_uInt32 n, SVBT32 p ) { p[0] = (sal_uInt8) p[2] = (sal_uInt8)(n >> 16); p[3] = (sal_uInt8)(n >> 24); } #if defined OSL_LITENDIAN -inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((sal_uInt8*)&n)[0]; - p[1] = ((sal_uInt8*)&n)[1]; - p[2] = ((sal_uInt8*)&n)[2]; - p[3] = ((sal_uInt8*)&n)[3]; - p[4] = ((sal_uInt8*)&n)[4]; - p[5] = ((sal_uInt8*)&n)[5]; - p[6] = ((sal_uInt8*)&n)[6]; - p[7] = ((sal_uInt8*)&n)[7]; } +inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = reinterpret_cast<sal_uInt8*>(&n)[0]; + p[1] = reinterpret_cast<sal_uInt8*>(&n)[1]; + p[2] = reinterpret_cast<sal_uInt8*>(&n)[2]; + p[3] = reinterpret_cast<sal_uInt8*>(&n)[3]; + p[4] = reinterpret_cast<sal_uInt8*>(&n)[4]; + p[5] = reinterpret_cast<sal_uInt8*>(&n)[5]; + p[6] = reinterpret_cast<sal_uInt8*>(&n)[6]; + p[7] = reinterpret_cast<sal_uInt8*>(&n)[7]; } #else -inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = ((sal_uInt8*)&n)[7]; - p[1] = ((sal_uInt8*)&n)[6]; - p[2] = ((sal_uInt8*)&n)[5]; - p[3] = ((sal_uInt8*)&n)[4]; - p[4] = ((sal_uInt8*)&n)[3]; - p[5] = ((sal_uInt8*)&n)[2]; - p[6] = ((sal_uInt8*)&n)[1]; - p[7] = ((sal_uInt8*)&n)[0]; } +inline void DoubleToSVBT64( double n, SVBT64 p ) { p[0] = reinterpret_cast<sal_uInt8*>(&n)[7]; + p[1] = reinterpret_cast<sal_uInt8*>(&n)[6]; + p[2] = reinterpret_cast<sal_uInt8*>(&n)[5]; + p[3] = reinterpret_cast<sal_uInt8*>(&n)[4]; + p[4] = reinterpret_cast<sal_uInt8*>(&n)[3]; + p[5] = reinterpret_cast<sal_uInt8*>(&n)[2]; + p[6] = reinterpret_cast<sal_uInt8*>(&n)[1]; + p[7] = reinterpret_cast<sal_uInt8*>(&n)[0]; } #endif #endif |