Concept-Checking Related Fixes

deanberris · deanberris · commit b7dc852ef181 · 2010-11-08T22:27:29.000+08:00
So upon building in debug mode, I've discovered that some new concepts
and checks are failing. These have now been fixed and addressed
appropriately.
diff --git a/boost/network/protocol/http/algorithms/linearize.hpp b/boost/network/protocol/http/algorithms/linearize.hpp
@@ -14,17 +14,21 @@
 
 namespace boost { namespace network { namespace http {
 
-    template <class Tag, class ValueType>
+    template <class Tag>
     struct linearize {
         typedef typename string<Tag>::type string_type;
 
         template <class Arguments>
-        struct result {
+        struct result;
+
+        template <class This, class Arg>
+        struct result<This(Arg)> {
             typedef string_type type;
         };
 
+        template <class ValueType>
         BOOST_CONCEPT_REQUIRES(
-            (Header<ValueType),
+            ((Header<ValueType>)),
             (string_type)
         ) operator()(ValueType & header) {
             typedef typename ostringstream<Tag>::type output_stream;
diff --git a/boost/network/protocol/http/header.hpp b/boost/network/protocol/http/header.hpp
@@ -23,6 +23,7 @@ namespace boost { namespace network { namespace http {
     template <class Tag>
     struct request_header
     {
+        typedef Tag tag;
         typedef typename string<Tag>::type string_type;
         string_type name, value;
     };
diff --git a/boost/network/protocol/http/server/async_connection.hpp b/boost/network/protocol/http/server/async_connection.hpp
@@ -161,11 +161,10 @@ namespace boost { namespace network { namespace http {
             std::ostream stream(&headers_buffer);
             if (!boost::empty(headers)) {
                 typedef typename Range::const_iterator iterator;
-                typedef typename Range::value_type value_type;
                 typedef typename string<Tag>::type string_type;
                 boost::transform(headers, 
                     std::ostream_iterator<string_type>(stream),
-                    linearize<Tag, value_type>());
+                    linearize<Tag>());
             } else {
                 stream << consts::crlf();
             }
diff --git a/boost/network/protocol/http/server/header.hpp b/boost/network/protocol/http/server/header.hpp
@@ -16,6 +16,7 @@ namespace boost { namespace network { namespace http {
     
     template <class Tag>
     struct response_header {
+        typedef Tag tag;
         typedef typename string<Tag>::type string_type;
         string_type name, value;
     };

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ namespace boost { namespace network { namespace http {`
`23`	`23`	`template <class Tag>`
`24`	`24`	`struct request_header`
`25`	`25`	`{`
	`26`	`+ typedef Tag tag;`
`26`	`27`	`typedef typename string<Tag>::type string_type;`
`27`	`28`	`string_type name, value;`
`28`	`29`	`};`