Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-08-02 20:41:55 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-08-02 21:03:09 (GMT) |
| commit | d5ace22054203c7989691ae8b3fa4e4784d1b57e (patch) | |
| tree | 64d400cdb10644967df183d0f202fcbf8160a773 /3rdParty/Boost/src/boost/asio/detail/completion_handler.hpp | |
| parent | 6f26d9aa86f0909af13b23b1a925b8d492e74154 (diff) | |
| download | swift-contrib-ks/boost1.47.zip swift-contrib-ks/boost1.47.tar.bz2 | |
Add two extra Boost dependencies, upgrade to 1.47.0ks/boost1.47
Diffstat (limited to '3rdParty/Boost/src/boost/asio/detail/completion_handler.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/detail/completion_handler.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/boost/asio/detail/completion_handler.hpp b/3rdParty/Boost/src/boost/asio/detail/completion_handler.hpp index 3b023d1..144ad7f 100644 --- a/3rdParty/Boost/src/boost/asio/detail/completion_handler.hpp +++ b/3rdParty/Boost/src/boost/asio/detail/completion_handler.hpp @@ -33,9 +33,9 @@ class completion_handler : public operation public: BOOST_ASIO_DEFINE_HANDLER_PTR(completion_handler); - completion_handler(Handler h) + completion_handler(Handler& h) : operation(&completion_handler::do_complete), - handler_(h) + handler_(BOOST_ASIO_MOVE_CAST(Handler)(h)) { } @@ -46,13 +46,15 @@ public: completion_handler* h(static_cast<completion_handler*>(base)); ptr p = { boost::addressof(h->handler_), h, h }; + BOOST_ASIO_HANDLER_COMPLETION((h)); + // Make a copy of the handler so that the memory can be deallocated before // the upcall is made. Even if we're not about to make an upcall, a // sub-object of the handler may be the true owner of the memory associated // with the handler. Consequently, a local copy of the handler is required // to ensure that any owning sub-object remains valid until after we have // deallocated the memory here. - Handler handler(h->handler_); + Handler handler(BOOST_ASIO_MOVE_CAST(Handler)(h->handler_)); p.h = boost::addressof(handler); p.reset(); @@ -60,7 +62,9 @@ public: if (owner) { boost::asio::detail::fenced_block b; + BOOST_ASIO_HANDLER_INVOCATION_BEGIN(()); boost_asio_handler_invoke_helpers::invoke(handler, handler); + BOOST_ASIO_HANDLER_INVOCATION_END; } } |