Merge pull request #1467 from jens-auer/upstream

Addressed comments from T. Köppe

src/decoder_allocators.cpp

@@ -38,7 +38,7 @@ zmq::shared_message_memory_allocator::shared_message_memory_allocator(size_t buf
         bufsize( 0 ),
         max_size( bufsize_ ),
         msg_refcnt( NULL ),
-        maxCounters( std::ceil( (double)max_size / (double)msg_t::max_vsm_size) )
+        maxCounters( std::ceil( static_cast<double>(max_size) / static_cast<double>(msg_t::max_vsm_size)) )
 {
 
 }
@@ -55,9 +55,7 @@ zmq::shared_message_memory_allocator::shared_message_memory_allocator(size_t buf
 
 zmq::shared_message_memory_allocator::~shared_message_memory_allocator()
 {
-    if (buf) {
-        deallocate();
-    }
+    deallocate();
 }
 
 unsigned char* zmq::shared_message_memory_allocator::allocate()
@@ -82,7 +80,7 @@ unsigned char* zmq::shared_message_memory_allocator::allocate()
         // allocate memory for reference counters together with reception buffer
         size_t const allocationsize = max_size + sizeof(zmq::atomic_counter_t) + maxCounters * sizeof(zmq::atomic_counter_t);
 
-        buf = (unsigned char *) malloc(allocationsize);
+        buf = static_cast<unsigned char *>( malloc(allocationsize) );
         alloc_assert (buf);
 
         new(buf) atomic_counter_t(1);
@@ -101,7 +99,7 @@ unsigned char* zmq::shared_message_memory_allocator::allocate()
 
 void zmq::shared_message_memory_allocator::deallocate()
 {
-    free(buf);
+    std::free(buf);
     buf = NULL;
     bufsize = 0;
     msg_refcnt = NULL;
@@ -119,7 +117,7 @@ unsigned char* zmq::shared_message_memory_allocator::release()
 
 void zmq::shared_message_memory_allocator::inc_ref()
 {
-    ((zmq::atomic_counter_t*)buf)->add(1);
+    (reinterpret_cast<zmq::atomic_counter_t*>(buf))->add(1);
 }
 
 void zmq::shared_message_memory_allocator::call_dec_ref(void*, void* hint) {

src/decoder_allocators.hpp

@@ -30,7 +30,7 @@
 #ifndef ZEROMQ_DECODER_ALLOCATORS_HPP
 #define ZEROMQ_DECODER_ALLOCATORS_HPP
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "err.hpp"
 #include "atomic_counter.hpp"
@@ -41,16 +41,16 @@ namespace zmq
     class c_single_allocator
     {
     public:
-        c_single_allocator(size_t bufsize_):
+        explicit c_single_allocator(size_t bufsize_):
                 bufsize(bufsize_),
-                buf((unsigned char*) malloc (bufsize))
+                buf(static_cast<unsigned char*>( malloc (bufsize) ))
         {
             alloc_assert (buf);
         }
 
         ~c_single_allocator()
         {
-            free(buf);
+            std::free(buf);
         }
 
         unsigned char* allocate()
@@ -92,7 +92,7 @@ namespace zmq
     class shared_message_memory_allocator
     {
     public:
-        shared_message_memory_allocator(size_t bufsize_);
+        explicit shared_message_memory_allocator(size_t bufsize_);
 
         // Create an allocator for a maximum number of messages
         shared_message_memory_allocator(size_t bufsize_, size_t maxMessages);