Commit a80fb347 authored by Martin Hurton's avatar Martin Hurton

Fix some comments regarding method overriding

parent 60d6b89c
......@@ -44,7 +44,7 @@ namespace zmq
protected:
// Overloads of functions from socket_base_t.
// Overrides of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
int xsend (zmq::msg_t *msg_);
......
......@@ -95,7 +95,7 @@ namespace zmq
void send_reaped ();
void send_done ();
// These handlers can be overloaded by the derived objects. They are
// These handlers can be overrided by the derived objects. They are
// called when command arrives from another thread.
virtual void process_stop ();
virtual void process_plug ();
......
......@@ -39,7 +39,7 @@ namespace zmq
pair_t (zmq::ctx_t *parent_, uint32_t tid_, int sid);
~pair_t ();
// Overloads of functions from socket_base_t.
// Overrides of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
int xsend (zmq::msg_t *msg_);
int xrecv (zmq::msg_t *msg_);
......
......@@ -42,7 +42,7 @@ namespace zmq
protected:
// Overloads of functions from socket_base_t.
// Overrides of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
......
......@@ -42,7 +42,7 @@ namespace zmq
protected:
// Overloads of functions from socket_base_t.
// Overrides of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
int xsend (zmq::msg_t *msg_);
bool xhas_out ();
......
......@@ -37,7 +37,7 @@ namespace zmq
rep_t (zmq::ctx_t *parent_, uint32_t tid_, int sid);
~rep_t ();
// Overloads of functions from socket_base_t.
// Overrides of functions from socket_base_t.
int xsend (zmq::msg_t *msg_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
......
......@@ -38,7 +38,7 @@ namespace zmq
req_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
~req_t ();
// Overloads of functions from socket_base_t.
// Overrides of functions from socket_base_t.
int xsend (zmq::msg_t *msg_);
int xrecv (zmq::msg_t *msg_);
bool xhas_in ();
......@@ -90,7 +90,7 @@ namespace zmq
const address_t *addr_);
~req_session_t ();
// Overloads of the functions from session_base_t.
// Overrides of the functions from session_base_t.
int push_msg (msg_t *msg_);
void reset ();
......
......@@ -44,7 +44,7 @@ namespace zmq
router_t (zmq::ctx_t *parent_, uint32_t tid_, int sid);
~router_t ();
// Overloads of functions from socket_base_t.
// Overrides of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
int xsend (zmq::msg_t *msg_);
......
......@@ -131,7 +131,7 @@ namespace zmq
bool subscribe_to_all_ = false) = 0;
// The default implementation assumes there are no specific socket
// options for the particular socket type. If not so, overload this
// options for the particular socket type. If not so, override this
// method.
virtual int xsetsockopt (int option_, const void *optval_,
size_t optvallen_);
......
......@@ -38,7 +38,7 @@ namespace zmq
stream_t (zmq::ctx_t *parent_, uint32_t tid_, int sid);
~stream_t ();
// Overloads of functions from socket_base_t.
// Overrides of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
int xsend (zmq::msg_t *msg_);
int xrecv (zmq::msg_t *msg_);
......
......@@ -68,13 +68,13 @@ int zmq::sub_t::xsetsockopt (int option_, const void *optval_,
int zmq::sub_t::xsend (msg_t *)
{
// Overload the XSUB's send.
// Override the XSUB's send.
errno = ENOTSUP;
return -1;
}
bool zmq::sub_t::xhas_out ()
{
// Overload the XSUB's send.
// Override the XSUB's send.
return false;
}
......@@ -43,7 +43,7 @@ namespace zmq
protected:
// Overloads of functions from socket_base_t.
// Overrides of functions from socket_base_t.
void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
int xsend (zmq::msg_t *msg_);
bool xhas_out ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment