3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove using of dynamic cast

Browse Source
This commit is contained in:
somdoron 2016-02-17 19:31:40 +02:00
parent b168e1044b
commit 352ae1468f
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); alloc_assert (s);
mailbox_t *mailbox = dynamic_cast<mailbox_t*> (s->mailbox); if (s->mailbox == NULL) {
if (mailbox != NULL && mailbox->get_fd () == retired_fd) {
s->destroyed = true; s->destroyed = true;
LIBZMQ_DELETE(s); LIBZMQ_DELETE(s);
return NULL; 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) if (thread_safe)
mailbox = new mailbox_safe_t(&sync); mailbox = new mailbox_safe_t(&sync);
else else {
mailbox = new mailbox_t(); 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 () 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); LIBZMQ_DELETE(reaper_signaler);
}
stop_monitor (); stop_monitor ();
zmq_assert (destroyed); zmq_assert (destroyed);