Patches from sub-forward branch incorporated

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 1682c05..59e2653 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -764,7 +764,7 @@ bool zmq::socket_base_t::xhas_out ()
     return false;
 }
 
-int zmq::socket_base_t::xsend (msg_t *msg_, int options_)
+int zmq::socket_base_t::xsend (msg_t *msg_, int flags_)
 {
     errno = ENOTSUP;
     return -1;
@@ -775,7 +775,7 @@ bool zmq::socket_base_t::xhas_in ()
     return false;
 }
 
-int zmq::socket_base_t::xrecv (msg_t *msg_, int options_)
+int zmq::socket_base_t::xrecv (msg_t *msg_, int flags_)
 {
     errno = ENOTSUP;
     return -1;
@@ -790,6 +790,11 @@ void zmq::socket_base_t::xwrite_activated (pipe_t *pipe_)
     zmq_assert (false);
 }
 
+void zmq::socket_base_t::xhiccuped (pipe_t *pipe_)
+{
+    zmq_assert (false);
+}
+
 void zmq::socket_base_t::in_event ()
 {
     //  Process any commands from other threads/sockets that may be available
@@ -837,6 +842,11 @@ void zmq::socket_base_t::write_activated (pipe_t *pipe_)
     xwrite_activated (pipe_);
 }
 
+void zmq::socket_base_t::hiccuped (pipe_t *pipe_)
+{
+    xhiccuped (pipe_);
+}
+
 void zmq::socket_base_t::terminated (pipe_t *pipe_)
 {
     //  Notify the specific socket type about the pipe termination.