diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2011-05-30 10:07:34 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2011-05-30 10:07:34 +0200 |
| commit | 0b59866a84f733e5a53b0d2f32570581691747ef (patch) | |
| tree | 8861d97915544dc4385177931f299a6f27603c92 /src/socket_base.hpp | |
| parent | 311fb0d852374e769d8ff791c9df38f0464960c6 (diff) | |
Patches from sub-forward branch incorporated
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/socket_base.hpp')
| -rw-r--r-- | src/socket_base.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/socket_base.hpp b/src/socket_base.hpp index 98046af..ed5620c 100644 --- a/src/socket_base.hpp +++ b/src/socket_base.hpp @@ -96,6 +96,7 @@ namespace zmq // i_pipe_events interface implementation. void read_activated (pipe_t *pipe_); void write_activated (pipe_t *pipe_); + void hiccuped (pipe_t *pipe_); void terminated (pipe_t *pipe_); protected: @@ -116,15 +117,16 @@ namespace zmq // The default implementation assumes that send is not supported. virtual bool xhas_out (); - virtual int xsend (class msg_t *msg_, int options_); + virtual int xsend (class msg_t *msg_, int flags_); // The default implementation assumes that recv in not supported. virtual bool xhas_in (); - virtual int xrecv (class msg_t *msg_, int options_); + virtual int xrecv (class msg_t *msg_, int flags_); // i_pipe_events will be forwarded to these functions. virtual void xread_activated (pipe_t *pipe_); virtual void xwrite_activated (pipe_t *pipe_); + virtual void xhiccuped (pipe_t *pipe_); virtual void xterminated (pipe_t *pipe_) = 0; // Delay actual destruction of the socket. |