Skip to content

Commit ec8a30a

Browse files
authored
Merge pull request #319 from gummif/gfa/msg-init
Problem: zmq_msg_init never fails
2 parents 5d8308d + e86bd7f commit ec8a30a

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

zmq.hpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,10 @@ inline std::tuple<int, int, int> version()
235235
class message_t
236236
{
237237
public:
238-
message_t()
238+
message_t() ZMQ_NOTHROW
239239
{
240240
int rc = zmq_msg_init(&msg);
241-
if (rc != 0)
242-
throw error_t();
241+
ZMQ_ASSERT(rc == 0);
243242
}
244243

245244
explicit message_t(size_t size_)
@@ -284,11 +283,10 @@ class message_t
284283
#endif
285284

286285
#ifdef ZMQ_HAS_RVALUE_REFS
287-
message_t(message_t &&rhs) : msg(rhs.msg)
286+
message_t(message_t &&rhs) ZMQ_NOTHROW : msg(rhs.msg)
288287
{
289288
int rc = zmq_msg_init(&rhs.msg);
290-
if (rc != 0)
291-
throw error_t();
289+
ZMQ_ASSERT(rc == 0);
292290
}
293291

294292
message_t &operator=(message_t &&rhs) ZMQ_NOTHROW
@@ -310,8 +308,7 @@ class message_t
310308
if (rc != 0)
311309
throw error_t();
312310
rc = zmq_msg_init(&msg);
313-
if (rc != 0)
314-
throw error_t();
311+
ZMQ_ASSERT(rc == 0);
315312
}
316313

317314
void rebuild(size_t size_)

0 commit comments

Comments
 (0)