From e132aabdae76103eb18e8ce8ea7114a1fdf59a4b Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 27 Sep 2013 13:07:10 -0700 Subject: [PATCH] Use boost for functional when the config is set --- modules/beast_asio/http/HTTPClientType.cpp | 4 ++-- modules/beast_core/system/FunctionalIncludes.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/beast_asio/http/HTTPClientType.cpp b/modules/beast_asio/http/HTTPClientType.cpp index 5c9328140d..46514a4657 100644 --- a/modules/beast_asio/http/HTTPClientType.cpp +++ b/modules/beast_asio/http/HTTPClientType.cpp @@ -62,8 +62,8 @@ public: { result_type result; boost::asio::io_service io_service; - async_get (io_service, url, bind ( - &HTTPClientType::handle_get, placeholders::_1, &result)); + async_get (io_service, url, beast::bind ( + &HTTPClientType::handle_get, beast::placeholders::_1, &result)); io_service.run (); return result; } diff --git a/modules/beast_core/system/FunctionalIncludes.h b/modules/beast_core/system/FunctionalIncludes.h index e8215f7db4..b7d4b370ba 100644 --- a/modules/beast_core/system/FunctionalIncludes.h +++ b/modules/beast_core/system/FunctionalIncludes.h @@ -23,7 +23,9 @@ // Choose a source of bind, placeholders, and function #if !BEAST_FUNCTIONAL_USES_STD && !BEAST_FUNCTIONAL_USES_TR1 && !BEAST_FUNCTIONAL_USES_BOOST -# if BEAST_MSVC +# if BEAST_USE_BOOST_FEATURES +# define BEAST_FUNCTIONAL_USES_BOOST 1 +# elif BEAST_MSVC # define BEAST_FUNCTIONAL_USES_STD 1 # elif BEAST_IOS || BEAST_MAC # include // detect version of std::lib