mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oox: strict aliasing warning:

Browse Source 
/oox/source/dump/dumperbase.cxx:345:69: error: dereferencing type-punned
pointer will break strict-aliasing rules [-Werror=strict-aliasing]
This commit is contained in:
Michael Stahl
2012-05-08 10:59:27 +02:00
parent 3c598c4064
commit 98bced0d35
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
oox/source/dump/dumperbase.cxx
View File

@@ -340,9 +340,20 @@ void StringHelper::appendHex( OUStringBuffer& rStr, sal_Int64 nData, bool bPrefi
appendHex( rStr, static_cast< sal_uInt64 >( nData ), bPrefix ); appendHex( rStr, static_cast< sal_uInt64 >( nData ), bPrefix );
} }
static sal_uInt64
lcl_ConvertDouble(double const f)
{
sal_uInt64 i;
for (size_t j = 0; j < sizeof(double); ++j)
{ // hopefully both endian independent and strict aliasing safe
reinterpret_cast<char *>(&i)[j] = reinterpret_cast<char const *>(&f)[j];
}
return i;
}
void StringHelper::appendHex( OUStringBuffer& rStr, double fData, bool bPrefix ) void StringHelper::appendHex( OUStringBuffer& rStr, double fData, bool bPrefix )
{ {
appendHex( rStr, *reinterpret_cast< const sal_uInt64* >( &fData ), bPrefix ); appendHex( rStr, lcl_ConvertDouble(fData), bPrefix );
} }
// append shortened hexadecimal ----------------------------------------------- // append shortened hexadecimal -----------------------------------------------
@@ -459,7 +470,7 @@ void StringHelper::appendBin( OUStringBuffer& rStr, sal_Int64 nData, bool bDots
void StringHelper::appendBin( OUStringBuffer& rStr, double fData, bool bDots ) void StringHelper::appendBin( OUStringBuffer& rStr, double fData, bool bDots )
{ {
appendBin( rStr, *reinterpret_cast< const sal_uInt64* >( &fData ), bDots ); appendBin( rStr, lcl_ConvertDouble(fData), bDots );
} }
// append formatted value ----------------------------------------------------- // append formatted value -----------------------------------------------------