Fixing more unqualified calls to begin(range) and end(range) that cause errors with MSVC 10.

deanberris · deanberris · commit 944ba1bb0633 · 2010-05-27T14:45:56.000+08:00
diff --git a/boost/network/protocol/http/impl/sync_connection_base.hpp b/boost/network/protocol/http/impl/sync_connection_base.hpp
@@ -119,7 +119,7 @@ namespace boost { namespace network { namespace http { namespace impl {
                 typename headers_range<basic_response<Tag> >::type transfer_encoding_range =
                     headers(response_)["Transfer-Encoding"];
                 if (empty(transfer_encoding_range)) throw std::runtime_error("Missing Transfer-Encoding Header from response.");
-                if (boost::iequals(begin(transfer_encoding_range)->second, "chunked")) {
+                if (boost::iequals(boost::begin(transfer_encoding_range)->second, "chunked")) {
                     bool stopping = false;
                     do { 
                         std::size_t chunk_size_line = read_until(socket_, response_buffer, "\r\n", error);
@@ -158,7 +158,7 @@ namespace boost { namespace network { namespace http { namespace impl {
                     } while (!stopping);
                 } else throw std::runtime_error("Unsupported Transfer-Encoding.");
             } else {
-                size_t length = lexical_cast<size_t>(begin(content_length_range)->second);
+                size_t length = lexical_cast<size_t>(boost::begin(content_length_range)->second);
                 size_t bytes_read = 0;
                 while ((bytes_read = boost::asio::read(socket_, response_buffer, boost::asio::transfer_at_least(1), error))) {
                     body_stream << &response_buffer;
@@ -234,7 +234,7 @@ namespace boost { namespace network { namespace http { namespace impl {
             connection_base::read_body(socket_, response_, response_buffer);    
             typename headers_range<basic_response<Tag> >::type connection_range =
                 headers(response_)["Connection"];
-            if (version_major == 1 && version_minor == 1 && !empty(connection_range) && boost::iequals(begin(connection_range)->second, "close")) {
+            if (version_major == 1 && version_minor == 1 && !empty(connection_range) && boost::iequals(boost::begin(connection_range)->second, "close")) {
                 close_socket();
             } else if (version_major == 1 && version_minor == 0) {
                 close_socket();
@@ -296,7 +296,7 @@ namespace boost { namespace network { namespace http { namespace impl {
             connection_base::read_body(socket_, response_, response_buffer);
             typename headers_range<basic_response<Tag> >::type connection_range =
                 headers(response_)["Connection"];
-            if (version_major == 1 && version_minor == 1 && !empty(connection_range) && boost::iequals(begin(connection_range)->second, "close")) {
+            if (version_major == 1 && version_minor == 1 && !empty(connection_range) && boost::iequals(boost::begin(connection_range)->second, "close")) {
                 close_socket();
             } else if (version_major == 1 && version_minor == 0) {
                 close_socket();
diff --git a/boost/network/protocol/http/policies/pooled_connection.hpp b/boost/network/protocol/http/policies/pooled_connection.hpp
@@ -89,7 +89,7 @@ namespace boost { namespace network { namespace http {
                     }
 
                     typename headers_range<basic_response<Tag> >::type connection_range = headers(response_)["Connection"];
-                    if (version_major == 1 && version_minor == 1 && !empty(connection_range) && begin(connection_range)->second == string_type("close")) {
+                    if (version_major == 1 && version_minor == 1 && !empty(connection_range) && boost::begin(connection_range)->second == string_type("close")) {
                         pimpl->close_socket();
                     } else if (version_major == 1 && version_minor == 0) {
                         pimpl->close_socket();
@@ -99,8 +99,8 @@ namespace boost { namespace network { namespace http {
                         boost::uint16_t status = response_.status();
                         if (status >= 300 && status <= 307) {
                             typename headers_range<basic_response<Tag> >::type location_range = headers(response_)["Location"];
-                            typename range_iterator<typename headers_range<basic_request<Tag> >::type>::type location_header = begin(location_range);
-                            if (location_header != end(location_range)) {
+                            typename range_iterator<typename headers_range<basic_request<Tag> >::type>::type location_header = boost::begin(location_range);
+                            if (location_header != boost::end(location_range)) {
                                 request_.uri(location_header->second);
                                 connection_ptr connection_;
                                 connection_ = get_connection_(resolver_, request_);
@@ -137,12 +137,12 @@ namespace boost { namespace network { namespace http {
                     , follow_redirect_
                     , request_.host()
                     , lexical_cast<string_type>(request_.port())
-                    , bind(
+                    , boost::bind(
                         &pooled_connection_policy<Tag,version_major,version_minor>::resolve,
                         this,
                         _1, _2, _3
                         )
-                    , bind(
+                    , boost::bind(
                         &pooled_connection_policy<Tag,version_major,version_minor>::get_connection,
                         this,
                         _1, _2
