mirror of
https://github.com/zeromq/libzmq.git
synced 2025-01-19 00:46:05 +01:00
rename ZMQ_UNUSED macro to LIBZMQ_UNUSED
This commit is contained in:
parent
b07b1e270e
commit
63260d8701
@ -512,15 +512,18 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
|
||||
|
||||
|
||||
/******************************************************************************/
|
||||
/* 0MQ General */
|
||||
/* 0MQ Internal Use */
|
||||
/******************************************************************************/
|
||||
|
||||
#define ZMQ_UNUSED(object) (void)object
|
||||
#define LIBZMQ_UNUSED(object) (void)object
|
||||
#define LIBZMQ_DELETE(p_object) {\
|
||||
delete p_object; \
|
||||
p_object = 0; \
|
||||
}
|
||||
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
#undef ZMQ_EXPORT
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
@ -43,7 +43,7 @@ zmq::client_t::~client_t ()
|
||||
|
||||
void zmq::client_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
|
||||
{
|
||||
ZMQ_UNUSED(subscribe_to_all_);
|
||||
LIBZMQ_UNUSED(subscribe_to_all_);
|
||||
|
||||
zmq_assert (pipe_);
|
||||
|
||||
|
@ -44,7 +44,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_);
|
||||
|
||||
|
@ -47,7 +47,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);
|
||||
|
||||
|
@ -44,7 +44,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_);
|
||||
|
@ -44,7 +44,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.
|
||||
|
@ -66,7 +66,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_);
|
||||
|
||||
|
@ -48,7 +48,7 @@ zmq::server_t::~server_t ()
|
||||
|
||||
void zmq::server_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
|
||||
{
|
||||
ZMQ_UNUSED(subscribe_to_all_);
|
||||
LIBZMQ_UNUSED(subscribe_to_all_);
|
||||
|
||||
zmq_assert (pipe_);
|
||||
|
||||
|
@ -58,7 +58,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
10
src/tcp.cpp
@ -94,13 +94,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
|
||||
|
@ -56,7 +56,7 @@
|
||||
int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_)
|
||||
{
|
||||
// TODO: Unused parameter, IPv6 support not implemented for Solaris.
|
||||
ZMQ_UNUSED(ipv6_);
|
||||
LIBZMQ_UNUSED(ipv6_);
|
||||
|
||||
// Create a socket.
|
||||
const int fd = open_socket (AF_INET, SOCK_DGRAM, 0);
|
||||
@ -123,7 +123,7 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_
|
||||
int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_)
|
||||
{
|
||||
// TODO: Unused parameter, IPv6 support not implemented for AIX or HP/UX.
|
||||
ZMQ_UNUSED(ipv6_);
|
||||
LIBZMQ_UNUSED(ipv6_);
|
||||
|
||||
// Create a socket.
|
||||
const int sd = open_socket (AF_INET, SOCK_DGRAM, 0);
|
||||
@ -209,8 +209,8 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_
|
||||
// This is true especially of Windows.
|
||||
int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_)
|
||||
{
|
||||
ZMQ_UNUSED(nic_);
|
||||
ZMQ_UNUSED(ipv6_);
|
||||
LIBZMQ_UNUSED(nic_);
|
||||
LIBZMQ_UNUSED(ipv6_);
|
||||
|
||||
errno = ENODEV;
|
||||
return -1;
|
||||
|
@ -55,7 +55,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_);
|
||||
|
Loading…
x
Reference in New Issue
Block a user