generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 02:42:58 +01:00
Code Issues Projects Releases Wiki Activity

- Replaced C-style casts with C++-casts

Browse Source 
- Replaced stdlib.h with cstdlib
- Made single-argument constructors explicit
This commit is contained in:
Jens Auer 2015-07-05 23:19:41 +02:00
parent f541ac9612
commit ef365151ca
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/decoder_allocators.cpp
View File

@ -38,7 +38,7 @@ zmq::shared_message_memory_allocator::shared_message_memory_allocator(size_t buf
bufsize( 0 ), bufsize( 0 ),
max_size( bufsize_ ), max_size( bufsize_ ),
msg_refcnt( NULL ), 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() zmq::shared_message_memory_allocator::~shared_message_memory_allocator()
{ {
if (buf) { deallocate();
deallocate();
}
} }
unsigned char* zmq::shared_message_memory_allocator::allocate() 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 // 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); 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); alloc_assert (buf);
new(buf) atomic_counter_t(1); 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() void zmq::shared_message_memory_allocator::deallocate()
{ {
free(buf); std::free(buf);
buf = NULL; buf = NULL;
bufsize = 0; bufsize = 0;
msg_refcnt = NULL; msg_refcnt = NULL;
@ -119,7 +117,7 @@ unsigned char* zmq::shared_message_memory_allocator::release()
void zmq::shared_message_memory_allocator::inc_ref() 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) { void zmq::shared_message_memory_allocator::call_dec_ref(void*, void* hint) {

10
src/decoder_allocators.hpp
View File

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