Revert "Revert "Merge branch 'master' of github.com:ianbarber/libzmq""

This reverts commit 029d3dfae2.
This commit is contained in:
Ian Barber
2012-06-12 14:43:18 +01:00
parent bdd4e1351d
commit eb14890d23
15 changed files with 331 additions and 119 deletions

View File

@@ -104,8 +104,8 @@ namespace zmq
// Pipe connecting the session to its socket.
zmq::pipe_t *pipe;
// Socket end of the pipe, for delay attach scenario
zmq::pipe_t *outpipe;
// This flag is set if we are disconnecting, but haven't yet completed
int incomplete_detach;
// This flag is true if the remainder of the message being processed
// is still in the in pipe.