Merge from trunk:

* Use correct basic_io_object member functions so that basic_object_handle works with c++11 compilers.

* Respect the OPENSSL_NO_ENGINE feature test #define.

* Last version's race-condition-related revert in the epoll_reactor was
  incomplete and broke out-of-band handling. Fixed epoll_reactor::start_op so
  that it is now exactly the same as the older, working version.

* Remove trailing whitespace.

* Eliminate a lock/unlock pair when rescheduling a strand.

* Added lazy registration for EPOLLOUT.

* Revision history.


[SVN r78708]
This commit is contained in:
Christopher Kohlhoff 2012-05-28 10:16:08 +00:00
parent 2a69da7ad0
commit 7fd21acf50

@ -1 +1 @@
Subproject commit 0f3e258725f4e0202d6d1e97ab2cfce6f380453b
Subproject commit eccba8602c2cf1fbec9def7231c4764ac9fa34c6