generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-03-01 20:02:15 +01:00
Code Issues Projects Releases Wiki Activity

Problem: zmq_msg_init never fails

Browse Source 
Solution: Mark functions noexcept and assert instead of throwing
This commit is contained in:
Gudmundur Adalsteinsson 2019-05-08 11:29:05 +00:00
parent 35ba5bea3b
commit e86bd7fc57
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -85,4 +85,3 @@ script:
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
- cmake --version - cmake --version
- ./ci_build.sh - ./ci_build.sh

13
zmq.hpp
View File

@ -235,11 +235,10 @@ inline std::tuple<int, int, int> version()
class message_t class message_t
{ {
public: public:
message_t() message_t() ZMQ_NOTHROW
{ {
int rc = zmq_msg_init(&msg); int rc = zmq_msg_init(&msg);
if (rc != 0) ZMQ_ASSERT(rc == 0);
throw error_t();
} }
explicit message_t(size_t size_) explicit message_t(size_t size_)
@ -284,11 +283,10 @@ class message_t
#endif #endif
#ifdef ZMQ_HAS_RVALUE_REFS #ifdef ZMQ_HAS_RVALUE_REFS
message_t(message_t &&rhs) : msg(rhs.msg) message_t(message_t &&rhs) ZMQ_NOTHROW : msg(rhs.msg)
{ {
int rc = zmq_msg_init(&rhs.msg); int rc = zmq_msg_init(&rhs.msg);
if (rc != 0) ZMQ_ASSERT(rc == 0);
throw error_t();
} }
message_t &operator=(message_t &&rhs) ZMQ_NOTHROW message_t &operator=(message_t &&rhs) ZMQ_NOTHROW
@ -310,8 +308,7 @@ class message_t
if (rc != 0) if (rc != 0)
throw error_t(); throw error_t();
rc = zmq_msg_init(&msg); rc = zmq_msg_init(&msg);
if (rc != 0) ZMQ_ASSERT(rc == 0);
throw error_t();
} }
void rebuild(size_t size_) void rebuild(size_t size_)