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

Problem: implicit conversion operators in context

Browse Source 
Solution: add handle() and mark operators as deprecated
This commit is contained in:
Gudmundur Adalsteinsson 2020-05-04 17:36:08 +00:00
parent a3e5b54c3c
commit 5a3dee082e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/context.cpp
View File

@ -15,16 +15,16 @@ TEST_CASE("context create, close and destroy", "[context]")
{ {
zmq::context_t context; zmq::context_t context;
context.close(); context.close();
CHECK(NULL == (void *) context); CHECK(NULL == context.handle());
} }
TEST_CASE("context shutdown", "[context]") TEST_CASE("context shutdown", "[context]")
{ {
zmq::context_t context; zmq::context_t context;
context.shutdown(); context.shutdown();
CHECK(NULL != (void *) context); CHECK(NULL != context.handle());
context.close(); context.close();
CHECK(NULL == (void *) context); CHECK(NULL == context.handle());
} }
TEST_CASE("context shutdown again", "[context]") TEST_CASE("context shutdown again", "[context]")
@ -32,9 +32,9 @@ TEST_CASE("context shutdown again", "[context]")
zmq::context_t context; zmq::context_t context;
context.shutdown(); context.shutdown();
context.shutdown(); context.shutdown();
CHECK(NULL != (void *) context); CHECK(NULL != context.handle());
context.close(); context.close();
CHECK(NULL == (void *) context); CHECK(NULL == context.handle());
} }
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11

7
zmq.hpp
View File

@ -788,6 +788,9 @@ class context_t
ZMQ_EXPLICIT operator void const *() const ZMQ_NOTHROW { return ptr; } ZMQ_EXPLICIT operator void const *() const ZMQ_NOTHROW { return ptr; }
ZMQ_NODISCARD void *handle() ZMQ_NOTHROW { return ptr; }
ZMQ_DEPRECATED("from 4.7.0, use handle() != nullptr instead")
operator bool() const ZMQ_NOTHROW { return ptr != ZMQ_NULLPTR; } operator bool() const ZMQ_NOTHROW { return ptr != ZMQ_NULLPTR; }
void swap(context_t &other) ZMQ_NOTHROW { std::swap(ptr, other.ptr); } void swap(context_t &other) ZMQ_NOTHROW { std::swap(ptr, other.ptr); }
@ -2051,8 +2054,8 @@ class socket_t : public detail::socket_base
socket_t() ZMQ_NOTHROW : detail::socket_base(ZMQ_NULLPTR), ctxptr(ZMQ_NULLPTR) {} socket_t() ZMQ_NOTHROW : detail::socket_base(ZMQ_NULLPTR), ctxptr(ZMQ_NULLPTR) {}
socket_t(context_t &context_, int type_) : socket_t(context_t &context_, int type_) :
detail::socket_base(zmq_socket(static_cast<void *>(context_), type_)), detail::socket_base(zmq_socket(context_.handle(), type_)),
ctxptr(static_cast<void *>(context_)) ctxptr(context_.handle())
{ {
if (_handle == ZMQ_NULLPTR) if (_handle == ZMQ_NULLPTR)
throw error_t(); throw error_t();