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

Problem: Friendship between socket_t and context_t

Browse Source 
Solution: Not needed since the void* can be obtained from the API of
context_t
This commit is contained in:
Gudmundur Adalsteinsson 2019-03-26 21:58:38 +00:00
parent 91fd0b5e0e
commit ff23b4ce95
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zmq.hpp
View File

@ -480,8 +480,6 @@ class message_t
class context_t class context_t
{ {
friend class socket_t;
public: public:
inline context_t() inline context_t()
{ {
@ -586,12 +584,18 @@ class socket_t
friend class monitor_t; friend class monitor_t;
public: public:
inline socket_t(context_t &context_, int type_) { init(context_, type_); } inline socket_t(context_t &context_, int type_)
: ptr(zmq_socket(static_cast<void*>(context_), type_))
, ctxptr(static_cast<void*>(context_))
{
if (ptr == ZMQ_NULLPTR)
throw error_t();
}
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11
inline socket_t(context_t &context_, socket_type type_) inline socket_t(context_t &context_, socket_type type_)
: socket_t(context_, static_cast<int>(type_))
{ {
init(context_, static_cast<int>(type_));
} }
#endif #endif
@ -756,14 +760,6 @@ class socket_t
#endif #endif
private: private:
inline void init(context_t &context_, int type_)
{
ctxptr = context_.ptr;
ptr = zmq_socket(context_.ptr, type_);
if (ptr == ZMQ_NULLPTR)
throw error_t();
}
void *ptr; void *ptr;
void *ctxptr; void *ctxptr;