diff options
| -rw-r--r-- | cppuhelper/source/typedescriptionprovider.cxx | 8 | ||||
| -rw-r--r-- | registry/tools/reg2bin.cxx | 9 |
2 files changed, 5 insertions, 12 deletions
diff --git a/cppuhelper/source/typedescriptionprovider.cxx b/cppuhelper/source/typedescriptionprovider.cxx index e0d51a18fe93..97a1788add04 100644 --- a/cppuhelper/source/typedescriptionprovider.cxx +++ b/cppuhelper/source/typedescriptionprovider.cxx @@ -259,10 +259,9 @@ struct Memory32 { } float getIso60599Binary32() const { - // Create a copy in either case, for alignment: union { unsigned char buf[4]; - float f; + float f; // assuming float is ISO 60599 binary32 } sa; #if defined OSL_LITENDIAN sa.buf[0] = byte[0]; @@ -276,7 +275,6 @@ struct Memory32 { sa.buf[3] = byte[0]; #endif return sa.f; - // assuming float is ISO 60599 binary32 } }; @@ -296,10 +294,9 @@ struct Memory64 { } double getIso60599Binary64() const { - // Create a copy in either case, for alignment: union { unsigned char buf[8]; - double d; + double d; // assuming double is ISO 60599 binary64 } sa; #if defined OSL_LITENDIAN sa.buf[0] = byte[0]; @@ -321,7 +318,6 @@ struct Memory64 { sa.buf[7] = byte[0]; #endif return sa.d; - // assuming double is ISO 60599 binary64 } }; diff --git a/registry/tools/reg2bin.cxx b/registry/tools/reg2bin.cxx index 3f42f28fb5bc..18976a0f1a58 100644 --- a/registry/tools/reg2bin.cxx +++ b/registry/tools/reg2bin.cxx @@ -958,10 +958,9 @@ void write64(osl::File & file, sal_uInt64 value) { void writeIso60599Binary32(osl::File & file, float value) { union { unsigned char buf[4]; - float f; + float f; // assuming float is ISO 60599 binary32 } sa; sa.f = value; - // assuming float is ISO 60599 binary32 #if defined OSL_BIGENDIAN std::swap(sa.buf[0], sa.buf[3]); std::swap(sa.buf[1], sa.buf[2]); @@ -970,13 +969,11 @@ void writeIso60599Binary32(osl::File & file, float value) { } void writeIso60599Binary64(osl::File & file, double value) { - union - { + union { unsigned char buf[8]; - float d; + float d; // assuming double is ISO 60599 binary64 } sa; sa.d = value; - // assuming double is ISO 60599 binary64 #if defined OSL_BIGENDIAN std::swap(sa.buf[0], sa.buf[7]); std::swap(sa.buf[1], sa.buf[6]); |