generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2024-12-13 18:55:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #52 from revaultch/master

Browse Source 
Fixes assertion error: src/mutex.hpp:123
This commit is contained in:
Constantin Rack 2015-11-10 21:20:11 +01:00
commit fadb37e4a7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zmq.hpp
View File

@ -372,16 +372,14 @@ namespace zmq
inline ~context_t () ZMQ_NOTHROW inline ~context_t () ZMQ_NOTHROW
{ {
close(); int rc = zmq_ctx_destroy (ptr);
ZMQ_ASSERT (rc == 0);
} }
inline void close() ZMQ_NOTHROW inline void close() ZMQ_NOTHROW
{ {
if (ptr == NULL) int rc = zmq_ctx_shutdown (ptr);
return;
int rc = zmq_ctx_destroy (ptr);
ZMQ_ASSERT (rc == 0); ZMQ_ASSERT (rc == 0);
ptr = NULL;
} }
// Be careful with this, it's probably only useful for // Be careful with this, it's probably only useful for