Getting the client_constructor_test to compile!

deanberris · deanberris · commit d9c30d7cfd60 · 2011-11-02T00:21:19.000+11:00
diff --git a/boost/network/message/transformers.hpp b/boost/network/message/transformers.hpp
@@ -14,7 +14,7 @@
 #include <boost/network/message/transformers/selectors.hpp>
 #include <boost/network/message/transformers/to_upper.hpp>
 #include <boost/network/message/transformers/to_lower.hpp>
-
+#include <boost/network/message/message_base.hpp>
 #include <boost/type_traits.hpp>
 
 namespace boost { namespace network {
@@ -37,23 +37,22 @@ namespace boost { namespace network {
             };
 
         template <class Algorithm, class Selector>
-            struct transform_impl : public get_real_algorithm<Algorithm, Selector>::type { };
+        struct transform_impl : public get_real_algorithm<Algorithm, Selector>::type { };
     } // namspace impl
 
     template <class Algorithm, class Selector>
-        inline impl::transform_impl<Algorithm, Selector>
-        transform(Algorithm, Selector) {
-            return impl::transform_impl<Algorithm, Selector>();
-        }
-
-    template <class Tag, class Algorithm, class Selector>
-        inline basic_message<Tag> &
-        operator<< (basic_message<Tag> & msg_, 
-                impl::transform_impl<Algorithm, Selector> 
-                    const & transformer) {
-            transformer(msg_);
-            return msg_;
-        }
+    inline impl::transform_impl<Algorithm, Selector>
+    transform(Algorithm, Selector) {
+      return impl::transform_impl<Algorithm, Selector>();
+    }
+
+    template <class Algorithm, class Selector>
+    message_base & operator<< (
+        message_base & msg_,
+        impl::transform_impl<Algorithm, Selector> const & transformer) {
+      transformer(msg_);
+      return msg_;
+    }
 
 } // namespace network
 
diff --git a/boost/network/message/wrappers/headers.hpp b/boost/network/message/wrappers/headers.hpp
@@ -11,7 +11,7 @@
 #include <boost/shared_container_iterator.hpp>
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/functions.hpp>
-#include <boost/network/detail/wrapper_base.hpp>
+#include <boost/network/message/message_base.hpp>
 
 namespace boost { namespace network {
 
diff --git a/boost/network/protocol/http/message/wrappers/version.hpp b/boost/network/protocol/http/message/wrappers/version.hpp
@@ -7,6 +7,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/network/protocol/http/response/response_base.hpp>
+
 namespace boost { namespace network { namespace http {
 
 namespace impl {
diff --git a/boost/network/protocol/http/policies/async_connection.hpp b/boost/network/protocol/http/policies/async_connection.hpp
@@ -28,6 +28,10 @@ struct simple_async_connection_manager : connection_manager {
                                   bool follow_redirects,
                                   optional<std::string> openssl_certificate,
                                   optional<std::string> openssl_verify_path);
+  simple_async_connection_manager(bool cache_resolved,
+                                  bool follow_redirects,
+                                  std::string const & openssl_certificate,
+                                  std::string const & openssl_verify_path);
   virtual shared_ptr<client_connection> get_connection(
       asio::io_service & service,
       request_base const & request);  // override
@@ -46,6 +50,10 @@ struct http_1_1_async_connection_manager : connection_manager, enable_shared_fro
                                     bool follow_redirects,
                                     optional<std::string> openssl_certificate,
                                     optional<std::string> openssl_verify_path);
+  http_1_1_async_connection_manager(bool cache_resolved,
+                                    bool follow_redirects,
+                                    std::string const & openssl_certificate,
+                                    std::string const & openssl_verify_path);
   virtual shared_ptr<client_connection> get_connection(
       asio::io_service & service,
       request_base const & request);  // override
diff --git a/libs/network/test/http/client_constructor_test.cpp b/libs/network/test/http/client_constructor_test.cpp
@@ -7,29 +7,28 @@
 #define BOOST_TEST_MODULE HTTP 1.0 Client Constructor Test
 #include <boost/network/include/http/client.hpp>
 #include <boost/test/unit_test.hpp>
-#include "client_types.hpp"
 
 namespace http = boost::network::http;
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(http_client_constructor_test, client, client_types) {
-    client instance;
+BOOST_AUTO_TEST_CASE(http_client_constructor_test) {
+    http::client instance;
     boost::asio::io_service io_service;
-    client instance2(io_service);
-    client instance3(http::_io_service=io_service);
+    http::client instance2(io_service);
+    http::client instance3(http::_io_service=io_service);
 }
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(http_cient_constructor_params_test, client, client_types) {
-    client instance(
+BOOST_AUTO_TEST_CASE(http_cient_constructor_params_test) {
+    http::client instance(
         http::_follow_redirects=true,
         http::_cache_resolved=true
         );
     boost::asio::io_service io_service;
-    client instance2(
+    http::client instance2(
         http::_follow_redirects=true,
         http::_io_service=io_service,
         http::_cache_resolved=true
         );
-    client instance3(
+    http::client instance3(
         http::_openssl_certificate="foo",
         http::_openssl_verify_path="bar"
         );
diff --git a/libs/network/test/http/client_types.hpp b/libs/network/test/http/client_types.hpp
diff --git a/libs/network/test/http/tag_types.hpp b/libs/network/test/http/tag_types.hpp
