merged a bunch of changes from 0.8

Author: glynos

boost/network/detail/wrapper_base.hpp

@@ -7,34 +7,38 @@
 #ifndef __NETWORK_DETAIL_WRAPPER_BASE_HPP__
 #define __NETWORK_DETAIL_WRAPPER_BASE_HPP__
 
-namespace boost { namespace network { namespace detail {
+namespace boost { namespace network {
 
     template <class Tag>
-        struct wrapper_base {
-            explicit wrapper_base(basic_message<Tag> & message_)
-                : _message(message_)
-            {};
+    struct basic_message;
+    
+    namespace detail {
 
-            protected:
-                ~wrapper_base() {}; // for extending only
+        template <class Tag>
+            struct wrapper_base {
+                explicit wrapper_base(basic_message<Tag> & message_)
+                    : _message(message_)
+                {};
 
-                basic_message<Tag> & _message;
-        };
+                protected:
+                    ~wrapper_base() {}; // for extending only
 
-    template <class Tag>
-        struct wrapper_base_const {
-            explicit wrapper_base_const(basic_message<Tag> const & message_)
-                : _message(message_)
-            {}
+                    basic_message<Tag> & _message;
+            };
 
-            protected:
-                ~wrapper_base_const() {}; // for extending only
+        template <class Tag>
+            struct wrapper_base_const {
+                explicit wrapper_base_const(basic_message<Tag> const & message_)
+                    : _message(message_)
+                {}
 
-                basic_message<Tag> const & _message;
-        };
+                protected:
+                    ~wrapper_base_const() {}; // for extending only
 
+                    basic_message<Tag> const & _message;
+            };
 
-} // namespace detail
+    } // namespace detail
 
 } // namespace network
 

boost/network/message/directives/remove_header.hpp

@@ -13,6 +13,9 @@
 
 namespace boost { namespace network {
 
+    template <class Tag>
+    struct basic_message;
+
 namespace impl {
 template <
     class T

boost/network/message/modifiers/add_header.hpp

@@ -27,13 +27,6 @@ namespace boost { namespace network {
             message.add_header(std::make_pair(key, value));
         }
 
-        template <class Message, class KeyType, class ValueType, class Async>
-        inline void add_header(Message const & message, KeyType const & key, ValueType const & value, tags::http_server const &, Async const &) {
-            typedef typename Message::headers_container_type::value_type value_type;
-            value_type header_ = { key, value };
-            message.headers.insert(message.headers.end(), header_);
-        }
-
     }
 
     template <class Tag, template <class> class Message, class KeyType, class ValueType>

boost/network/message/modifiers/body.hpp

@@ -23,11 +23,6 @@ namespace boost { namespace network {
             message.body(body_);
         }
 
-        template <class Message, class ValueType, class Async>
-        inline void body(Message const & message, ValueType const & body_, tags::http_server, Async) {
-            message.body = body_;
-        }
-
     } // namespace impl
 
     template <class Tag, template <class> class Message, class ValueType>

boost/network/message/modifiers/clear_headers.hpp

@@ -25,11 +25,6 @@ namespace boost { namespace network {
             header_promise.set_value(typename Message::headers_container_type());
         }
 
-        template <class Message, class Async>
-        inline void clear_headers(Message const & message, tags::http_server const &, Async const &) {
-            (typename Message::headers_container_type()).swap(message.headers);
-        }
-
     } // namespace impl
 
     template <class Tag, template <class> class Message>

boost/network/message/modifiers/destination.hpp

@@ -24,10 +24,6 @@ namespace boost { namespace network {
             message.destination(destination_);
         }
 
-        template <class Message, class ValueType, class Async>
-        inline void destination(Message const & message, ValueType const & destination_, tags::http_server, Async) {
-            message.destination = destination_;
-        }
     }
 
     template <class Tag, template<class> class Message, class ValueType>

boost/network/message/modifiers/remove_header.hpp

@@ -8,7 +8,6 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/network/support/is_async.hpp>
-#include <algorithm>
 
 namespace boost { namespace network {
 
@@ -29,29 +28,6 @@ namespace boost { namespace network {
             message.remove_header(key);
         }
 
-        template <class KeyType>
-        struct equals {
-            explicit equals(KeyType const & key_)
-            : key(key_) {}
-            equals(equals const & other)
-            : key(other.key) {}
-            template <class RequestHeader>
-            bool operator()(RequestHeader const & header) {
-                return boost::iequals(header.name, key);
-            }
-            KeyType const & key;
-        };
-
-        template <class Message, class KeyType, class Async>
-        inline void remove_header(Message const & message, KeyType const & key, tags::http_server const &, Async const &) {
-            typedef typename Message::headers_container_type::iterator iterator;
-            iterator end = message.headers.end();
-            iterator new_end = std::remove_if(
-                message.headers.begin(),
-                message.headers.end(),
-                equals<KeyType>(key));
-            message.headers.erase(new_end, end);
-        }
 
     } // namespace impl
 

boost/network/message/modifiers/source.hpp

@@ -23,11 +23,6 @@ namespace boost { namespace network {
             message.source(source_);
         }
 
-        template <class Message, class ValueType, class Async>
-        inline void source(Message const & message, ValueType const & source_, tags::http_server const &, Async const &) {
-            message.source = source_;
-        }
-
     } // namespace impl
 
     template <class Tag, template <class> class Message, class ValueType>

boost/network/protocol/http/client/facade.hpp

@@ -8,7 +8,7 @@
 
 #include <boost/network/protocol/http/request.hpp>
 #include <boost/network/protocol/http/response.hpp>
-#include <boost/network/support/sync_only.hpp>
+#include <boost/network/protocol/http/support/sync_only.hpp>
 
 namespace boost { namespace network { namespace http {
 

boost/network/protocol/http/impl/request.hpp

@@ -159,8 +159,8 @@ namespace boost { namespace network { namespace http {
 
     /** Specialize the traits for the http_server tag. */
     template <>
-    struct headers_container<tags::http_server> :
-        vector<tags::http_server>::apply<http::request_header>
+    struct headers_container<http::tags::http_server> :
+        vector<http::tags::http_server>::apply<http::request_header>
     {};
 
     namespace http { namespace impl {