Fix LIBZMQ-576 - Revert "Merge pull request #510 from miniway/master"

This reverts commit f27eb67e1a, reversing
changes made to a3ae0d4c16.

https://zeromq.jira.com/browse/LIBZMQ-576

Conflicts:
	src/stream_engine.cpp

Conflicts were around additional defaults to the constructor after the
'terminating' default.  The additional defaults were left alone, and
the 'terminating' default was removed.
This commit is contained in:
AJ Lewis
2014-01-02 10:43:01 -06:00
parent 2fa49e96d2
commit cd2827fb36
4 changed files with 0 additions and 19 deletions

View File

@@ -162,7 +162,6 @@ namespace zmq
std::string endpoint;
bool plugged;
bool terminating;
int (stream_engine_t::*read_msg) (msg_t *msg_);