3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 09:47:56 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1811 from somdoron/master

Browse Source 
problem: dynamic cast is causing issue when compiling for nodejs
This commit is contained in:
Luca Boccassi 2016-02-17 17:41:26 +00:00
commit b20259809d
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/socket_base.cpp
View File

@ -169,9 +169,7 @@ zmq::socket_base_t *zmq::socket_base_t::create (int type_, class ctx_t *parent_,
alloc_assert (s);
mailbox_t *mailbox = dynamic_cast<mailbox_t*> (s->mailbox);
if (mailbox != NULL && mailbox->get_fd () == retired_fd) {
if (s->mailbox == NULL) {
s->destroyed = true;
LIBZMQ_DELETE(s);
return NULL;
@ -200,17 +198,24 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_, bool
if (thread_safe)
mailbox = new mailbox_safe_t(&sync);
else
mailbox = new mailbox_t();
else {
mailbox_t *m = new mailbox_t();
if (m->get_fd () != retired_fd)
mailbox = m;
else {
LIBZMQ_DELETE (m);
mailbox = NULL;
}
}
}
zmq::socket_base_t::~socket_base_t ()
{
LIBZMQ_DELETE(mailbox);
if (mailbox)
LIBZMQ_DELETE(mailbox);
if (reaper_signaler) {
if (reaper_signaler)
LIBZMQ_DELETE(reaper_signaler);
}
stop_monitor ();
zmq_assert (destroyed);