I added a couple of fixes to ensure compilation on MSVC 10.

glynos · glynos · commit afb49277ab22 · 2011-08-27T22:24:35.000+02:00
diff --git a/boost/network/protocol/http/client/connection/sync_base.hpp b/boost/network/protocol/http/client/connection/sync_base.hpp
@@ -130,7 +130,7 @@ namespace boost { namespace network { namespace http { namespace impl {
                 }
                 if (boost::iequals(boost::begin(transfer_encoding_range)->second, "chunked")) {
                     bool stopping = false;
-                    do { 
+                    do {
                         std::size_t chunk_size_line = read_until(socket_, response_buffer, "\r\n", error);
                         if ((chunk_size_line == 0) && (error != boost::asio::error::eof)) throw boost::system::system_error(error);
                         std::size_t chunk_size = 0;
@@ -163,7 +163,7 @@ namespace boost { namespace network { namespace http { namespace impl {
 
                             if (chunk_size != 0)
                                 throw std::runtime_error("Size mismatch between tranfer encoding chunk data size and declared chunk size.");
-                        } 
+                        }
                     } while (!stopping);
                 } else throw std::runtime_error("Unsupported Transfer-Encoding.");
             } else {
@@ -177,7 +177,7 @@ namespace boost { namespace network { namespace http { namespace impl {
                 while ((bytes_read = boost::asio::read(socket_, response_buffer, boost::asio::transfer_at_least(1), error))) {
                     body_stream << &response_buffer;
                     length -= bytes_read;
-                    if ((length <= 0) or error)
+                    if ((length <= 0) || error)
                         break;
                 }
             }
diff --git a/boost/network/protocol/http/policies/pooled_connection.hpp b/boost/network/protocol/http/policies/pooled_connection.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace network { namespace http {
         typedef typename resolver_base::resolver_type resolver_type;
         typedef function<typename resolver_base::resolver_iterator_pair(resolver_type &, string_type const &, string_type const &)> resolver_function_type;
         typedef function<void(iterator_range<char const *> const &, system::error_code const &)> body_callback_function_type;
-        
+
         void cleanup() {
             host_connection_map().swap(host_connections);
         }
@@ -85,9 +85,9 @@ namespace boost { namespace network { namespace http {
                     pimpl->read_headers(response_, response_buffer);
 
                     if (
-                        get_body && response_.status() != 304 
+                        get_body && response_.status() != 304
                         && (response_.status() != 204)
-                        && not (response_.status() >= 100 && response_.status() <= 199)
+                        && !(response_.status() >= 100 && response_.status() <= 199)
                        ) {
                         pimpl->read_body(response_, response_buffer);
                     }
@@ -125,7 +125,7 @@ namespace boost { namespace network { namespace http {
         };
 
         typedef shared_ptr<connection_impl> connection_ptr;
-        
+
         typedef unordered_map<string_type, connection_ptr> host_connection_map;
         host_connection_map host_connections;
         bool follow_redirect_;
@@ -164,7 +164,7 @@ namespace boost { namespace network { namespace http {
 
         pooled_connection_policy(bool cache_resolved, bool follow_redirect)
         : resolver_base(cache_resolved), host_connections(), follow_redirect_(follow_redirect) {}
-        
+
     };
 
 } // namespace http
