summaryrefslogtreecommitdiff
path: root/src/zmq_init.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-02-22 16:23:36 +0100
committerMartin Sustrik <sustrik@250bpm.com>2011-02-22 16:23:36 +0100
commit43e8868875e1d5287979e5b9060a9b16be45cc79 (patch)
treed6df0587b107de28641b429048dff002e3c2387f /src/zmq_init.cpp
parent98ccff1a24a056aef15372b131eee1c1bf8f62ca (diff)
Added explicit error message in case of memory exhaustion
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/zmq_init.cpp')
-rw-r--r--src/zmq_init.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/zmq_init.cpp b/src/zmq_init.cpp
index afb4011..747e1b4 100644
--- a/src/zmq_init.cpp
+++ b/src/zmq_init.cpp
@@ -43,7 +43,7 @@ zmq::zmq_init_t::zmq_init_t (io_thread_t *io_thread_,
{
// Create the engine object for this connection.
engine = new (std::nothrow) zmq_engine_t (fd_, options);
- zmq_assert (engine);
+ alloc_assert (engine);
}
zmq::zmq_init_t::~zmq_init_t ()
@@ -180,7 +180,7 @@ void zmq::zmq_init_t::dispatch_engine ()
if (peer_identity [0] == 0) {
session = new (std::nothrow) transient_session_t (io_thread,
socket, options);
- zmq_assert (session);
+ alloc_assert (session);
session->inc_seqnum ();
launch_sibling (session);
send_attach (session, ephemeral_engine, peer_identity, false);
@@ -205,7 +205,7 @@ void zmq::zmq_init_t::dispatch_engine ()
// being attached.
session = new (std::nothrow) named_session_t (io_thread, socket,
options, peer_identity);
- zmq_assert (session);
+ alloc_assert (session);
session->inc_seqnum ();
launch_sibling (session);
send_attach (session, ephemeral_engine, peer_identity, false);