generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-19 13:59:37 +01:00
Code Issues Projects Releases Wiki Activity

rename ZMQ_UNUSED macro to LIBZMQ_UNUSED

Browse Source 
Backported from zeromq/libzmq@63260d8

# Conflicts:
#	include/zmq.h
#	src/client.cpp
#	src/server.cpp
This commit is contained in:
Jean-Christophe Fillion-Robin 2016-01-30 03:46:46 -05:00
parent 9df7ed0740
commit 300d80ffe9
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/zmq.h
View File

@ -408,10 +408,10 @@ ZMQ_EXPORT uint8_t *zmq_z85_decode (uint8_t *dest, char *string);
ZMQ_EXPORT int zmq_device (int type, void *frontend, void *backend);
/******************************************************************************/
/* 0MQ General */
/* 0MQ Internal Use */
/******************************************************************************/
#define ZMQ_UNUSED(object) (void)object
#define LIBZMQ_UNUSED(object) (void)object
#undef ZMQ_EXPORT

2
src/dealer.cpp
View File

@ -34,7 +34,7 @@ zmq::dealer_t::~dealer_t ()
void zmq::dealer_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
{
ZMQ_UNUSED(subscribe_to_all_);
LIBZMQ_UNUSED(subscribe_to_all_);
zmq_assert (pipe_);

2
src/pair.cpp
View File

@ -36,7 +36,7 @@ zmq::pair_t::~pair_t ()
void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
{
ZMQ_UNUSED(subscribe_to_all_);
LIBZMQ_UNUSED(subscribe_to_all_);
zmq_assert (pipe_ != NULL);

2
src/pull.cpp
View File

@ -34,7 +34,7 @@ zmq::pull_t::~pull_t ()
void zmq::pull_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
{
ZMQ_UNUSED(subscribe_to_all_);
LIBZMQ_UNUSED(subscribe_to_all_);
zmq_assert (pipe_);
fq.attach (pipe_);

2
src/push.cpp
View File

@ -34,7 +34,7 @@ zmq::push_t::~push_t ()
void zmq::push_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
{
ZMQ_UNUSED(subscribe_to_all_);
LIBZMQ_UNUSED(subscribe_to_all_);
// Don't delay pipe termination as there is no one
// to receive the delimiter.

2
src/router.cpp
View File

@ -55,7 +55,7 @@ zmq::router_t::~router_t ()
void zmq::router_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
{
ZMQ_UNUSED(subscribe_to_all_);
LIBZMQ_UNUSED(subscribe_to_all_);
zmq_assert (pipe_);

2
src/stream.cpp
View File

@ -48,7 +48,7 @@ zmq::stream_t::~stream_t ()
void zmq::stream_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
{
ZMQ_UNUSED(subscribe_to_all_);
LIBZMQ_UNUSED(subscribe_to_all_);
zmq_assert (pipe_);

10
src/tcp.cpp
View File

@ -84,13 +84,13 @@ void zmq::set_tcp_receive_buffer (fd_t sockfd_, int bufsize_)
void zmq::tune_tcp_keepalives (fd_t s_, int keepalive_, int keepalive_cnt_, int keepalive_idle_, int keepalive_intvl_)
{
// These options are used only under certain #ifdefs below.
ZMQ_UNUSED(keepalive_);
ZMQ_UNUSED(keepalive_cnt_);
ZMQ_UNUSED(keepalive_idle_);
ZMQ_UNUSED(keepalive_intvl_);
LIBZMQ_UNUSED(keepalive_);
LIBZMQ_UNUSED(keepalive_cnt_);
LIBZMQ_UNUSED(keepalive_idle_);
LIBZMQ_UNUSED(keepalive_intvl_);
// If none of the #ifdefs apply, then s_ is unused.
ZMQ_UNUSED(s_);
LIBZMQ_UNUSED(s_);
// Tuning TCP keep-alives if platform allows it
// All values = -1 means skip and leave it for OS

8
src/tcp_address.cpp
View File

@ -53,7 +53,7 @@
int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_)
{
// TODO: Unused parameter, IPv6 support not implemented for Solaris.
ZMQ_UNUSED(ipv6_);
LIBZMQ_UNUSED(ipv6_);
// Create a socket.
int fd = open_socket (AF_INET, SOCK_DGRAM, 0);
@ -117,7 +117,7 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_)
int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_)
{
// TODO: Unused parameter, IPv6 support not implemented for AIX or HP/UX.
ZMQ_UNUSED(ipv6_);
LIBZMQ_UNUSED(ipv6_);
// Create a socket.
int sd = open_socket (AF_INET, SOCK_DGRAM, 0);
@ -195,8 +195,8 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_)
// This is true especially of Windows.
int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_)
{
ZMQ_UNUSED(nic_);
ZMQ_UNUSED(ipv6_);
LIBZMQ_UNUSED(nic_);
LIBZMQ_UNUSED(ipv6_);
errno = ENODEV;
return -1;

2
src/xsub.cpp
View File

@ -45,7 +45,7 @@ zmq::xsub_t::~xsub_t ()
void zmq::xsub_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
{
ZMQ_UNUSED(subscribe_to_all_);
LIBZMQ_UNUSED(subscribe_to_all_);
zmq_assert (pipe_);
fq.attach (pipe_);