The unified diff between revisions [9c7c7bce..] and [d6ae13f4..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "modules/alloc_mmap/mmap_mem.cpp"
#  from [bcc0cd00d3471aaee882d52f5a0f407077760c1e]
#    to [19ff049ea80042cf62e1f02ede47004f3acf048a]
#
# patch "modules/es_egd/es_egd.cpp"
#  from [d2e8722a61cb5410d0c6372cf1db0d6c6f8c81a9]
#    to [39d2684aac4c7a382253daf8e50b1c00d797d437]
#
# patch "modules/es_ftw/es_ftw.cpp"
#  from [e3e4ab8fa77a8bfd63f160494073ba9c70d84fe3]
#    to [6b9dc7cec896eed27ff456d7a2e4df9947eae598]
#
# patch "modules/es_unix/unix_cmd.cpp"
#  from [9727c050244b2a27760d460a060ed36ebd37b08d]
#    to [e749e0619b750a2faf429dcd44fc030f344fd280]
#
============================================================
--- modules/alloc_mmap/mmap_mem.cpp	bcc0cd00d3471aaee882d52f5a0f407077760c1e
+++ modules/alloc_mmap/mmap_mem.cpp	19ff049ea80042cf62e1f02ede47004f3acf048a
@@ -90,7 +90,7 @@ void* MemoryMapping_Allocator::alloc_blo
    void* ptr = mmap(0, n, PROT_READ | PROT_WRITE, MAP_SHARED,
                     file.get_fd(), 0);

-   if(ptr == (void*)MAP_FAILED)
+   if(ptr == static_cast<void*>(MAP_FAILED))
       throw MemoryMapping_Failed("Could not map file");

    return ptr;
============================================================
--- modules/es_egd/es_egd.cpp	d2e8722a61cb5410d0c6372cf1db0d6c6f8c81a9
+++ modules/es_egd/es_egd.cpp	39d2684aac4c7a382253daf8e50b1c00d797d437
@@ -61,7 +61,7 @@ u32bit EGD_EntropySource::do_poll(byte o

    byte buffer[2];
    buffer[0] = 1;
-   buffer[1] = (byte)length;
+   buffer[1] = static_cast<byte>(length);

    if(write(fd, buffer, 2) != 2) { close(fd); return 0; }
    if(read(fd, buffer, 1) != 1)  { close(fd); return 0; }
============================================================
--- modules/es_ftw/es_ftw.cpp	e3e4ab8fa77a8bfd63f160494073ba9c70d84fe3
+++ modules/es_ftw/es_ftw.cpp	6b9dc7cec896eed27ff456d7a2e4df9947eae598
@@ -97,7 +97,7 @@ void FTW_EntropySource::gather_from_file
       return;

    SecureVector<byte> read_buf(1024);
-   ssize_t got = ::read(fd, (byte*)read_buf.begin(), read_buf.size());
+   ssize_t got = ::read(fd, read_buf.begin(), read_buf.size());
    close(fd);

    if(got > 0)
============================================================
--- modules/es_unix/unix_cmd.cpp	9727c050244b2a27760d460a060ed36ebd37b08d
+++ modules/es_unix/unix_cmd.cpp	e749e0619b750a2faf429dcd44fc030f344fd280
@@ -86,7 +86,7 @@ u32bit DataSource_Command::read(byte buf
       return 0;
       }

-   return (u32bit)got;
+   return static_cast<u32bit>(got);
    }

 /*************************************************