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/handler_alloc_helpers.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/handler_alloc_helpers.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/detail/handler_alloc_helpers.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/asio/detail/handler_alloc_helpers.hpp b/3rdParty/Boost/src/boost/asio/detail/handler_alloc_helpers.hpp index fc3ec33..609fb4b 100644 --- a/3rdParty/Boost/src/boost/asio/detail/handler_alloc_helpers.hpp +++ b/3rdParty/Boost/src/boost/asio/detail/handler_alloc_helpers.hpp @@ -35,7 +35,7 @@ inline void* allocate(std::size_t s, Handler& h) || BOOST_WORKAROUND(__GNUC__, < 3) return ::operator new(s); #else - using namespace boost::asio; + using boost::asio::asio_handler_allocate; return asio_handler_allocate(s, boost::addressof(h)); #endif } @@ -47,7 +47,7 @@ inline void deallocate(void* p, std::size_t s, Handler& h) || BOOST_WORKAROUND(__GNUC__, < 3) ::operator delete(p); #else - using namespace boost::asio; + using boost::asio::asio_handler_deallocate; asio_handler_deallocate(p, s, boost::addressof(h)); #endif } |