@@ -61,7 +61,6 @@ class MemoryMapManager final {
6161 const boost::filesystem::path filename_pattern)
6262 : chunk_size_(chunk_size), directory_(directory), filename_pattern_(filename_pattern) {}
6363 ~MemoryMapManager () = default ;
64- ~MemoryMapManager () {}
6564
6665 /* Using GetAdress to read multiple bytes is unsafe as it might be a buffer overflow
6766 *
@@ -78,7 +77,7 @@ class MemoryMapManager final {
7877
7978 void * chunk_address = GetChunk (chunk_number);
8079
81- return ( reinterpret_cast <char *>(chunk_address) + chunk_offset) ;
80+ return static_cast <char *>(chunk_address) + chunk_offset;
8281 }
8382
8483 /* Get a buffer as copy.
@@ -93,12 +92,12 @@ class MemoryMapManager final {
9392 size_t second_chunk_size = buffer_length - first_chunk_size;
9493
9594 void * chunk_address = GetChunk (chunk_number);
96- std::memcpy (buffer, reinterpret_cast <char *>(chunk_address) + chunk_offset, first_chunk_size);
95+ std::memcpy (buffer, static_cast <char *>(chunk_address) + chunk_offset, first_chunk_size);
9796
9897 if (second_chunk_size > 0 ) {
9998 void * chunk_address_part2 = GetChunk (chunk_number + 1 );
100- std::memcpy (reinterpret_cast <char *>(buffer) + first_chunk_size,
101- reinterpret_cast < const char *>(chunk_address_part2), second_chunk_size);
99+ std::memcpy (static_cast <char *>(buffer) + first_chunk_size, static_cast < const char *>(chunk_address_part2) ,
100+ second_chunk_size);
102101 }
103102 }
104103
@@ -125,8 +124,8 @@ class MemoryMapManager final {
125124 size_t copy_size = std::min (remaining, chunk_size_ - chunk_offset);
126125 TRACE (" copy size: %ld" , copy_size);
127126
128- std::memcpy (reinterpret_cast <char *>(chunk_address) + chunk_offset,
129- reinterpret_cast < const char *>(buffer) + buffer_offset, copy_size);
127+ std::memcpy (static_cast <char *>(chunk_address) + chunk_offset, static_cast < const char *>(buffer) + buffer_offset ,
128+ copy_size);
130129
131130 remaining -= copy_size;
132131 tail_ += copy_size;
@@ -150,7 +149,7 @@ class MemoryMapManager final {
150149 void * chunk_address = GetChunk (chunk_number);
151150 size_t first_chunk_size = std::min (buffer_length, chunk_size_ - chunk_offset);
152151
153- if (std::memcmp (reinterpret_cast <char *>(chunk_address) + chunk_offset, buffer, first_chunk_size) != 0 ) {
152+ if (std::memcmp (static_cast <char *>(chunk_address) + chunk_offset, buffer, first_chunk_size) != 0 ) {
154153 return false ;
155154 }
156155
@@ -161,9 +160,8 @@ class MemoryMapManager final {
161160
162161 // handle overflow
163162 void * chunk_address_part2 = GetChunk (chunk_number + 1 );
164- return (std::memcmp (reinterpret_cast <const char *>(chunk_address_part2),
165- reinterpret_cast <const char *>(buffer) + first_chunk_size,
166- buffer_length - first_chunk_size) == 0 );
163+ return (std::memcmp (static_cast <const char *>(chunk_address_part2),
164+ static_cast <const char *>(buffer) + first_chunk_size, buffer_length - first_chunk_size) == 0 );
167165 }
168166
169167 void Write (std::ostream& stream, const size_t end) const {
@@ -191,7 +189,7 @@ class MemoryMapManager final {
191189 size_t bytes_in_chunk = std::min (chunk_size_, remaining);
192190 TRACE (" write chunk %d, with size: %ld, remaining: %ld" , chunk, bytes_in_chunk, remaining);
193191
194- const char * ptr = reinterpret_cast <const char *>(mappings_[chunk].get_address ());
192+ const char * ptr = static_cast <const char *>(mappings_[chunk].get_address ());
195193 stream.write (ptr, bytes_in_chunk);
196194
197195 remaining -= bytes_in_chunk;
0 commit comments