Changeset 78708

Timestamp:

May 28, 2012, 10:16:08 AM (10 years ago)

Author:

chris_kohlhoff

Message:

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.

(No files)