Skip to content

Commit

Permalink
Merge pull request #143 from benjamg/develop
Browse files Browse the repository at this point in the history
rename of option to match libzmq rename (#141)
  • Loading branch information
hintjens committed Feb 18, 2016
2 parents db5cfc2 + 5eca145 commit 9fac09b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/zmqpp/socket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ void socket::set(socket_option const option, int const value)
#endif
#if (ZMQ_VERSION_MAJOR > 4 || ZMQ_VERSION_MAJOR == 4 && ZMQ_VERSION_MINOR >= 2)
case socket_option::xpub_manual:
case socket_option::xpub_verbose_unsubscribe:
case socket_option::xpub_verboser:
#endif

if (value == 0) { set(option, false); }
Expand Down Expand Up @@ -519,7 +519,7 @@ void socket::set(socket_option const option, bool const value)
#endif
#if (ZMQ_VERSION_MAJOR > 4 || ZMQ_VERSION_MAJOR == 4 && ZMQ_VERSION_MINOR >= 2)
case socket_option::xpub_manual:
case socket_option::xpub_verbose_unsubscribe:
case socket_option::xpub_verboser:
#endif
{
int ivalue = value ? 1 : 0;
Expand Down
2 changes: 1 addition & 1 deletion src/zmqpp/socket_options.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ ZMQPP_COMPARABLE_ENUM socket_option {
#endif
#if (ZMQ_VERSION_MAJOR > 4) || ((ZMQ_VERSION_MAJOR == 4) && (ZMQ_VERSION_MINOR >= 2))
xpub_manual = ZMQ_XPUB_MANUAL,
xpub_verbose_unsubscribe = ZMQ_XPUB_VERBOSE_UNSUBSCRIBE,
xpub_verboser = ZMQ_XPUB_VERBOSER,
#endif
#endif // version > 2

Expand Down

0 comments on commit 9fac09b

Please sign in to comment.