Merge pull request #408 from gummif/gfa/ctx-handle

Problem: implicit conversion operators in context

Author: sigiesec

tests/context.cpp

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

zmq.hpp

@@ -812,6 +812,9 @@ class context_t
 
     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; }
 
     void swap(context_t &other) ZMQ_NOTHROW { std::swap(ptr, other.ptr); }
@@ -2075,8 +2078,8 @@ class socket_t : public detail::socket_base
     socket_t() ZMQ_NOTHROW : detail::socket_base(ZMQ_NULLPTR), ctxptr(ZMQ_NULLPTR) {}
 
     socket_t(context_t &context_, int type_) :
-        detail::socket_base(zmq_socket(static_cast<void *>(context_), type_)),
-        ctxptr(static_cast<void *>(context_))
+        detail::socket_base(zmq_socket(context_.handle(), type_)),
+        ctxptr(context_.handle())
     {
         if (_handle == ZMQ_NULLPTR)
             throw error_t();