generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-27 19:10:22 +01:00
Code Issues Projects Releases Wiki Activity

Deallocation functions in zmq.h and msg_t class are consistent.

Browse Source 
The two functions had different calling conventions (C vs. C++).
It is fixed now.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik
2011-05-03 23:20:43 +02:00
parent 5e329ba7ca
commit ceb5e1a073
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msg.cpp
View File

@@ -68,7 +68,7 @@ int zmq::msg_t::init_size (size_t size_)
return 0; return 0;
} }
int zmq::msg_t::init_data (void *data_, size_t size_, zmq_free_fn *ffn_, int zmq::msg_t::init_data (void *data_, size_t size_, msg_free_fn *ffn_,
void *hint_) void *hint_)
{ {
u.lmsg.type = type_lmsg; u.lmsg.type = type_lmsg;

15
src/msg.hpp
View File

@@ -26,6 +26,14 @@
#include "config.hpp" #include "config.hpp"
#include "atomic_counter.hpp" #include "atomic_counter.hpp"
// Signature for free function to deallocate the message content.
// Note that it has to be declared as "C" so that it is the same as
// zmq_free_fn defined in zmq.h.
extern "C"
{
typedef void (msg_free_fn) (void *data, void *hint);
}
namespace zmq namespace zmq
{ {
@@ -43,13 +51,10 @@ namespace zmq
shared = 128 shared = 128
}; };
// Signature for free function to deallocate the message content.
typedef void (free_fn_t) (void *data, void *hint);
bool check (); bool check ();
int init (); int init ();
int init_size (size_t size_); int init_size (size_t size_);
int init_data (void *data_, size_t size_, free_fn_t *ffn_, int init_data (void *data_, size_t size_, msg_free_fn *ffn_,
void *hint_); void *hint_);
int init_delimiter (); int init_delimiter ();
int close (); int close ();
@@ -82,7 +87,7 @@ namespace zmq
{ {
void *data; void *data;
size_t size; size_t size;
free_fn_t *ffn; msg_free_fn *ffn;
void *hint; void *hint;
zmq::atomic_counter_t refcnt; zmq::atomic_counter_t refcnt;
}; };