generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-01-19 08:46:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #299 from gummif/gfa/remove-friend

Browse Source 
Problem: Friendship between socket_t and context_t
This commit is contained in:
Simon Giesecke 2019-03-27 11:58:31 +01:00 committed by GitHub
commit 47df7b0cb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
{
friend class socket_t;
public:
inline context_t()
{
@ -586,12 +584,18 @@ class socket_t
friend class monitor_t;
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
inline socket_t(context_t &context_, socket_type type_)
: socket_t(context_, static_cast<int>(type_))
{
init(context_, static_cast<int>(type_));
}
#endif
@ -756,14 +760,6 @@ class socket_t
#endif
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 *ctxptr;