[lmi-commits] [6291] Resolve gcc-5 issues (VZ)

[Greg Chicares]

Revision: 6291
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6291
Author:   chicares
Date:     2015-09-20 15:48:30 +0000 (Sun, 20 Sep 2015)
Log Message:
-----------
Resolve gcc-5 issues (VZ)

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/md5.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-09-19 23:46:02 UTC (rev 6290)
+++ lmi/trunk/ChangeLog 2015-09-20 15:48:30 UTC (rev 6291)
@@ -36809,3 +36809,20 @@
   mc_enum_types_aux.cpp
 Reduce physical dependency by fixing 'build_type=so_test' erosion.
 
+20150919T2345 <zeitlin> [474]
+
+  aclocal/wxwin.m4
+Update from wxwidgets.org .
+
+20150919T2346 <zeitlin> [474]
+
+  configure.ac
+  Makefile.am
+Use wxPdfDocument.
+
+20150920T1548Z <address@hidden> [474]
+
+  md5.cpp
+Resolve gcc-5 issues (VZ). See:
+  http://lists.nongnu.org/archive/html/lmi/2015-09/msg00000.html
+

Modified: lmi/trunk/md5.cpp
===================================================================
--- lmi/trunk/md5.cpp   2015-09-19 23:46:02 UTC (rev 6290)
+++ lmi/trunk/md5.cpp   2015-09-20 15:48:30 UTC (rev 6291)
@@ -161,9 +161,10 @@
   std::memcpy (&ctx->buffer[bytes], fillbuf, pad);
 
   /* Put the 64-bit file length in *bits* at the end of the buffer. */
-  *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
-  *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
-                            (ctx->total[0] >> 29));
+  md5_uint32 z = SWAP (ctx->total[0] << 3);
+  std::memcpy(&ctx->buffer[bytes + pad], &z, sizeof(z));
+  z = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
+  std::memcpy(&ctx->buffer[bytes + pad + 4], &z, sizeof(z));
 
   /* Process last bytes. */
   md5_process_block (ctx->buffer, bytes + pad + 8, ctx);