0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-14 09:47:56 +08:00

Problem: warnings with xcode (#4043)

* remove override instructions to avoid a chain reaction with other overridden functions missing it

Co-authored-by: Stéphane Valès <stephane@vales.fr@users.noreply.github.com>
Co-authored-by: stephane vales <vales@ingenuity.io>
This commit is contained in:
Stéphane Valès 2020-09-17 16:12:36 +02:00 committed by GitHub
parent 86bf83bce8
commit 1495ccad58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 9 deletions

View File

@ -175,7 +175,7 @@ void generic_mtrie_t<T>::rm (value_t *pipe_,
std::list<struct iter> stack;
unsigned char *buff = NULL;
size_t maxbuffsize = 0;
struct iter it = {this, NULL, NULL, 0, 0, 0, false};
struct iter it = {this, NULL, NULL, 0, 0, 0, 0, false};
stack.push_back (it);
while (!stack.empty ()) {
@ -215,8 +215,14 @@ void generic_mtrie_t<T>::rm (value_t *pipe_,
// visit after the operation on the child can do the removals.
it.processed_for_removal = true;
stack.push_back (it);
struct iter next = {
it.node->_next.node, NULL, NULL, ++it.size, 0, 0, false};
struct iter next = {it.node->_next.node,
NULL,
NULL,
++it.size,
0,
0,
0,
false};
stack.push_back (next);
break;
}
@ -245,6 +251,7 @@ void generic_mtrie_t<T>::rm (value_t *pipe_,
it.size + 1,
0,
0,
0,
false};
stack.push_back (next);
}

View File

@ -732,6 +732,7 @@ unsigned int zmq::ip_resolver_t::do_if_nametoindex (const char *ifname_)
&& !defined ZMQ_HAVE_VXWORKS
return if_nametoindex (ifname_);
#else
LIBZMQ_UNUSED (ifname_);
// The function 'if_nametoindex' is not supported on Windows XP.
// If we are targeting XP using a vxxx_xp toolset then fail.
// This is brutal as this code could be run on later windows clients

View File

@ -98,10 +98,26 @@ class stream_engine_base_t : public io_object_t, public i_engine
virtual bool handshake () { return true; };
virtual void plug_internal (){};
virtual int process_command_message (msg_t *msg_) { return -1; };
virtual int produce_ping_message (msg_t *msg_) { return -1; };
virtual int process_heartbeat_message (msg_t *msg_) { return -1; };
virtual int produce_pong_message (msg_t *msg_) { return -1; };
virtual int process_command_message (msg_t *msg_)
{
LIBZMQ_UNUSED (msg_);
return -1;
};
virtual int produce_ping_message (msg_t *msg_)
{
LIBZMQ_UNUSED (msg_);
return -1;
};
virtual int process_heartbeat_message (msg_t *msg_)
{
LIBZMQ_UNUSED (msg_);
return -1;
};
virtual int produce_pong_message (msg_t *msg_)
{
LIBZMQ_UNUSED (msg_);
return -1;
};
virtual int read (void *data, size_t size_);
virtual int write (const void *data_, size_t size_);

View File

@ -282,15 +282,16 @@ void zmq::ws_connecter_t::create_engine (fd_t fd_,
// Create the engine object for this connection.
i_engine *engine = NULL;
if (_wss)
if (_wss) {
#ifdef ZMQ_HAVE_WSS
engine = new (std::nothrow)
wss_engine_t (fd_, options, endpoint_pair, *_addr->resolved.ws_addr,
true, NULL, _hostname);
#else
LIBZMQ_UNUSED (_hostname);
assert (false);
#endif
else
} else
engine = new (std::nothrow) ws_engine_t (
fd_, options, endpoint_pair, *_addr->resolved.ws_addr, true);
alloc_assert (engine);

View File

@ -944,6 +944,7 @@ int zmq::ws_engine_t::produce_close_message (msg_t *msg_)
int zmq::ws_engine_t::produce_no_msg_after_close (msg_t *msg_)
{
LIBZMQ_UNUSED (msg_);
_next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
&ws_engine_t::close_connection_after_close);
@ -953,6 +954,7 @@ int zmq::ws_engine_t::produce_no_msg_after_close (msg_t *msg_)
int zmq::ws_engine_t::close_connection_after_close (msg_t *msg_)
{
LIBZMQ_UNUSED (msg_);
error (connection_error);
errno = ECONNRESET;
return -1;