Cleaning up tag dispatch of HTTP-specific modifiers.

deanberris · deanberris · commit 2af5fb0b3628 · 2010-11-28T14:07:59.000+08:00
diff --git a/boost/network/protocol/http/message/modifiers/body.hpp b/boost/network/protocol/http/message/modifiers/body.hpp
@@ -33,16 +33,6 @@ namespace boost { namespace network { namespace http {
             response.body(future);
         }
 
-        template <class Tag, class T>
-        void body(basic_request<Tag> & request, T const & value, tags::server const &) {
-            request.body = value;
-        }
-
-        template <class Tag, class T>
-        void body(basic_request<Tag> & request, T const & value, tags::client const &) {
-            request << ::boost::network::body(value);
-        }
-
     }
 
     template <class Tag, class T>
@@ -54,16 +44,13 @@ namespace boost { namespace network { namespace http {
     template <class Tag, class T>
     inline void
     body_impl(basic_request<Tag> & request, T const & value, tags::server) {
-        impl::body(request, value, Tag());
+        request.body = value;
     }
 
-    template <class R>
-    struct ClientRequest;
-
     template <class Tag, class T>
     inline void
     body_impl(basic_request<Tag> & request, T const & value, tags::client) {
-        impl::body(request, value, Tag());
+        request << ::boost::network::body(value);
     }
 
     template <class Tag, class T>
diff --git a/boost/network/protocol/http/message/modifiers/clear_headers.hpp b/boost/network/protocol/http/message/modifiers/clear_headers.hpp
@@ -1,28 +1,32 @@
 #ifndef BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_MODIFIERS_CLEAR_HEADER_HPP_20101128
 #define BOOST_NETWORK_PROTOCOL_HTTP_MESSAGE_MODIFIERS_CLEAR_HEADER_HPP_20101128
 
+// Copyright 2010 Dean Michael Berris. 
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
 #include <boost/network/protocol/http/support/client_or_server.hpp>
+#include <boost/network/support/pod_or_normal.hpp>
 #include <boost/network/support/is_async.hpp>
 #include <boost/thread/future.hpp>
 
 namespace boost { namespace network { namespace http {
 
-    namespace impl {
-
-        template <class Tag>
-        inline typename enable_if<
-            is_client<Tag>
-            , void
-            >::type
-        clear_headers(basic_request<Tag> & request) {
-            request.headers(typename basic_request<Tag>::headers_container_type());
-        }
+    template <class Tag>
+    inline void clear_headers_impl(basic_request<Tag> & request, tags::pod) {
+        typedef typename basic_request<Tag>::headers_container_type headers_container;
+        headers_container().swap(request.headers);
+    }
 
-    } /* impl */
+    template <class Tag>
+    inline void clear_headers_impl(basic_request<Tag> & request, tags::normal) {
+        request.headers(typename basic_request<Tag>::headers_container_type());
+    }
 
     template <class Tag>
     inline void clear_headers_impl(basic_request<Tag> & request, tags::client) {
-        impl::clear_headers(request);
+        clear_headers_impl(request, typename pod_or_normal<Tag>::type());
     }
 
     template <class Tag>
diff --git a/boost/network/protocol/http/message/modifiers/destination.hpp b/boost/network/protocol/http/message/modifiers/destination.hpp
@@ -7,6 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/network/protocol/http/support/client_or_server.hpp>
+#include <boost/network/support/pod_or_normal.hpp>
 #include <boost/network/support/is_async.hpp>
 #include <boost/thread/future.hpp>
 #include <boost/concept/requires.hpp>
@@ -31,16 +32,6 @@ namespace boost { namespace network { namespace http {
             response.destination(future);
         }
 
-        template <class Tag, class T>
-        void destination(basic_request<Tag> & request, T const & value, tags::server const &) {
-            request.destination = value;
-        }
-
-        template <class Tag, class T>
-        void destination(basic_request<Tag> & request, T const & value, tags::client const &) {
-            request << ::boost::network::destination(value);
-        }
-
     }
 
     template <class Tag, class T>
@@ -55,13 +46,25 @@ namespace boost { namespace network { namespace http {
     template <class Tag, class T>
     inline void
     destination_impl(basic_request<Tag> & request, T const & value, tags::server) {
-        impl::destination(request, value, Tag());
+        request.destination = value;
+    }
+
+    template <class Tag, class T>
+    inline void
+    destination_impl(basic_request<Tag> & request, T const & value, tags::pod) {
+        request.destination = value;
+    }
+
+    template <class Tag, class T>
+    inline void
+    destination_impl(basic_request<Tag> & request, T const & value, tags::normal) {
+        request.destination(value);
     }
 
     template <class Tag, class T>
     inline void
     destination_impl(basic_request<Tag> & request, T const & value, tags::client) {
-        impl::destination(request, value, Tag());
+        destination_impl(request, value, typename pod_or_normal<Tag>::type());
     }
 
     template <class Tag, class T>
