Merge branch '0.8-devel' of git://github.com/mikhailberis/cpp-netlib into xmpp

glynos · glynos · commit 3312a7b5d094 · 2010-10-25T19:39:47.000+02:00
diff --git a/boost/network/include/message.hpp b/boost/network/include/message.hpp
@@ -8,6 +8,7 @@
 //
 // This is the modular include file for using the basic message type
 
+#include <boost/network/tags.hpp>
 #include <boost/network/message.hpp>
 
 #endif // BOOST_NETWORK_INCLUDE_MESSAGE_HPP_
diff --git a/boost/network/message.hpp b/boost/network/message.hpp
@@ -6,7 +6,7 @@
 #ifndef __NETWORK_MESSAGE_HPP__
 #define __NETWORK_MESSAGE_HPP__
 
-#include "boost/network/message_fwd.hpp"
+#include <boost/network/message_fwd.hpp>
 #include <boost/network/traits/string.hpp>
 #include <boost/network/traits/ostringstream.hpp>
 #include <boost/network/traits/headers_container.hpp>
@@ -38,7 +38,7 @@ namespace boost { namespace network {
     /** The common message type.
      */
     template <class Tag>
-    class basic_message {
+    struct basic_message {
         public:
 
         typedef Tag tag;
@@ -138,9 +138,12 @@ namespace boost { namespace network {
         // swap for ADL
         left.swap(right);
     }
-
-BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_string> >));
-BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_wstring> >));
+    
+    // Commenting this out as we don't need to do this anymore.
+    // BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_string> >));
+    // BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_wstring> >));
+    typedef basic_message<tags::default_string> message;
+    typedef basic_message<tags::default_wstring> wmessage;
 
 } // namespace network
 } // namespace boost
diff --git a/boost/network/message/wrappers/headers.hpp b/boost/network/message/wrappers/headers.hpp
@@ -25,7 +25,7 @@ namespace boost { namespace network {
         };
 
     template <class Tag>
-    class basic_message;
+    struct basic_message;
 
     /** headers wrapper for messages.
      *
diff --git a/boost/network/message_fwd.hpp b/boost/network/message_fwd.hpp
@@ -6,21 +6,12 @@
 #ifndef __2008817MESSAGE_FWD_INC__
 # define __2008817MESSAGE_FWD_INC__
 
-
-// Includes 
-# include <boost/network/tags.hpp>
-
-
 namespace boost {
 namespace network {
-template <
-    class Tag
-    >
-class basic_message;
 
+template <class Tag>
+struct basic_message;
 
-typedef basic_message<tags::default_string> message;
-typedef basic_message<tags::default_wstring> wmessage;
 } // namespace boost
 } // namespace network
 
diff --git a/boost/network/protocol/http/impl/http_async_connection.hpp b/boost/network/protocol/http/impl/http_async_connection.hpp
@@ -50,9 +50,9 @@ namespace boost { namespace network { namespace http { namespace impl {
                 resolve_function resolve, 
                 bool follow_redirect 
                 ) : 
+                follow_redirect_(follow_redirect),
                 resolver_(resolver),
                 resolve_(resolve), 
-                follow_redirect_(follow_redirect),
                 request_strand_(new boost::asio::io_service::strand(resolver->get_io_service()))
             {}
 
@@ -303,11 +303,11 @@ namespace boost { namespace network { namespace http { namespace impl {
             }
         }
 
-        boost::shared_ptr<boost::asio::io_service::strand> request_strand_;
+        bool follow_redirect_;
         boost::shared_ptr<resolver_type> resolver_;
         boost::shared_ptr<boost::asio::ip::tcp::socket> socket_;
         resolve_function resolve_;
-        bool follow_redirect_;
+        boost::shared_ptr<boost::asio::io_service::strand> request_strand_;
         string_type command_string_;
         string_type method;
     };
diff --git a/boost/network/protocol/http/impl/https_async_connection.hpp b/boost/network/protocol/http/impl/https_async_connection.hpp
@@ -39,11 +39,11 @@ namespace boost { namespace network { namespace http { namespace impl {
                 bool follow_redirect,
                 optional<string_type> const & certificate_filename = optional<string_type>() 
                 ) : 
+                follow_redirect_(follow_redirect),
                 resolver_(resolver),
+                certificate_filename_(certificate_filename),
                 resolve_(resolve), 
-                follow_redirect_(follow_redirect),
-                request_strand_(new boost::asio::io_service::strand(resolver->get_io_service())),
-                certificate_filename_(certificate_filename)
+                request_strand_(new boost::asio::io_service::strand(resolver->get_io_service()))
             {}
 
 
@@ -337,13 +337,13 @@ namespace boost { namespace network { namespace http { namespace impl {
             }
         }
 
-        boost::shared_ptr<boost::asio::io_service::strand> request_strand_;
+        bool follow_redirect_;
         boost::shared_ptr<resolver_type> resolver_;
         optional<string_type> certificate_filename_;
         resolve_function resolve_;
         boost::shared_ptr<boost::asio::ssl::context> context_;
         boost::shared_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket> > socket_;
-        bool follow_redirect_;
+        boost::shared_ptr<boost::asio::io_service::strand> request_strand_;
         string_type command_string_;
         string_type method;
     };
diff --git a/boost/network/protocol/http/message/wrappers/anchor.hpp b/boost/network/protocol/http/message/wrappers/anchor.hpp
@@ -7,8 +7,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/concept/requires.hpp>
-
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -27,12 +25,8 @@ namespace boost { namespace network { namespace http {
         };
     }
 
-    template <class Message>
-    struct Request;
-
     template <class Tag> inline
-    BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
-        (impl::anchor_wrapper<Tag>))
+    impl::anchor_wrapper<Tag>
     anchor(basic_request<Tag> const & request) {
         return impl::anchor_wrapper<Tag>(request);
     }
diff --git a/boost/network/protocol/http/message/wrappers/body.hpp b/boost/network/protocol/http/message/wrappers/body.hpp
@@ -31,23 +31,16 @@ namespace boost { namespace network { namespace http {
 
     } // namespace impl
 
-    template <class R>
-    struct Response;
-
-    template <class R>
-    struct Request;
-
     template <class Tag>
     inline
-    BOOST_CONCEPT_REQUIRES(((Response<basic_response<Tag> >)),
-        (typename impl::body_wrapper<basic_response<Tag> >::string_type const))
+    typename impl::body_wrapper<basic_response<Tag> >::string_type const
     body(basic_response<Tag> const & message) {
         return impl::body_wrapper<basic_response<Tag> >(message);
     }
 
     template <class Tag>
-    inline BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
-        (typename impl::body_wrapper<basic_request<Tag> >::string_type const))
+    inline
+    typename impl::body_wrapper<basic_request<Tag> >::string_type const
     body(basic_request<Tag> const & message) {
         return impl::body_wrapper<basic_request<Tag> >(message);
     }
diff --git a/boost/network/protocol/http/message/wrappers/helper.hpp b/boost/network/protocol/http/message/wrappers/helper.hpp
@@ -7,7 +7,6 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/mpl/if.hpp>
-#include <boost/concept/requires.hpp>
 
 #ifndef BOOST_NETWORK_DEFINE_HTTP_WRAPPER
 #define BOOST_NETWORK_DEFINE_HTTP_WRAPPER(name, accessor, pod_field)    \
@@ -48,21 +47,21 @@
             : message_(message) {}                                      \
         name##_wrapper(name##_wrapper const & other)                    \
             : message_(other.message_) {}                               \
-        operator string_type () {                                       \
+        operator string_type () const {                                 \
             return this->get_value(message_);                           \
         }                                                               \
     };                                                                  \
                                                                         \
     template <class Tag>                                                \
-    inline BOOST_CONCEPT_REQUIRES(((Response<basic_response<Tag> >)),   \
-        (name##_wrapper<basic_response<Tag> > const))                   \
+    inline                                                              \
+    name##_wrapper<basic_response<Tag> > const                          \
     name (basic_response<Tag> const & message) {                        \
         return name##_wrapper<basic_response<Tag> >(message);           \
     }                                                                   \
                                                                         \
     template <class Tag>                                                \
-    inline BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),     \
-        (name##_wrapper<basic_request<Tag> > const))                    \
+    inline                                                              \
+    name##_wrapper<basic_request<Tag> > const                           \
     name (basic_request<Tag> const & message) {                         \
         return name##_wrapper<basic_request<Tag> >(message);            \
     }
diff --git a/boost/network/protocol/http/message/wrappers/host.hpp b/boost/network/protocol/http/message/wrappers/host.hpp
@@ -7,9 +7,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/network/protocol/http/request_concept.hpp>
-#include <boost/concept/requires.hpp>
-
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -35,8 +32,7 @@ namespace boost { namespace network { namespace http {
 
     template <class Tag>
     inline 
-    BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
-        (impl::host_wrapper<Tag>))
+    impl::host_wrapper<Tag>
     host(basic_request<Tag> const & request) {
         return impl::host_wrapper<Tag>(request);
     }
diff --git a/boost/network/protocol/http/message/wrappers/path.hpp b/boost/network/protocol/http/message/wrappers/path.hpp
@@ -7,9 +7,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/network/protocol/http/request_concept.hpp>
-#include <boost/concept/requires.hpp>
-
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -35,8 +32,7 @@ namespace boost { namespace network { namespace http {
 
     template <class Tag>
     inline
-    BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
-        (impl::path_wrapper<Tag>))
+    impl::path_wrapper<Tag>
     path(basic_request<Tag> const & request) {
         return impl::path_wrapper<Tag>(request);
     }
diff --git a/boost/network/protocol/http/message/wrappers/port.hpp b/boost/network/protocol/http/message/wrappers/port.hpp
@@ -7,9 +7,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/network/protocol/http/request_concept.hpp>
-#include <boost/concept/requires.hpp>
-
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -35,8 +32,7 @@ namespace boost { namespace network { namespace http {
 
     template <class Tag>
     inline
-    BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
-        (impl::port_wrapper<Tag>))
+    impl::port_wrapper<Tag>
     port(basic_request<Tag> const & request) {
         return impl::port_wrapper<Tag>(request);
     }
diff --git a/boost/network/protocol/http/message/wrappers/protocol.hpp b/boost/network/protocol/http/message/wrappers/protocol.hpp
@@ -7,9 +7,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/network/protocol/http/request_concept.hpp>
-#include <boost/concept/requires.hpp>
-
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -29,8 +26,7 @@ namespace boost { namespace network { namespace http {
     }
 
     template <class Tag> inline
-    BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
-        (impl::protocol_wrapper<Tag>))
+    impl::protocol_wrapper<Tag>
     protocol(basic_request<Tag> const & request) {
         return impl::protocol_wrapper<Tag>(request);
     }
diff --git a/boost/network/protocol/http/message/wrappers/query.hpp b/boost/network/protocol/http/message/wrappers/query.hpp
@@ -7,9 +7,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/network/protocol/http/request_concept.hpp>
-#include <boost/concept/requires.hpp>
-
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -36,8 +33,7 @@ namespace boost { namespace network { namespace http {
 
     template <class Tag>
     inline
-    BOOST_CONCEPT_REQUIRES (((Request<basic_request<Tag> >)),
-        (impl::query_wrapper<Tag>))
+    impl::query_wrapper<Tag>
     query(basic_request<Tag> const & request) {
         return impl::query_wrapper<Tag>(request);
     }
diff --git a/boost/network/protocol/http/message/wrappers/status.hpp b/boost/network/protocol/http/message/wrappers/status.hpp
@@ -8,7 +8,6 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/cstdint.hpp>
-#include <boost/concept/requires.hpp>
 
 namespace boost { namespace network { namespace http {
 
@@ -41,8 +40,7 @@ namespace boost { namespace network { namespace http {
 
     template <class Tag>
     inline
-    BOOST_CONCEPT_REQUIRES(((Response<basic_response<Tag> >)),
-        (impl::status_wrapper<Tag>))
+    impl::status_wrapper<Tag>
     status(basic_response<Tag> const & response) {
         return impl::status_wrapper<Tag>(response);
     }
diff --git a/boost/network/protocol/http/message/wrappers/status_message.hpp b/boost/network/protocol/http/message/wrappers/status_message.hpp
@@ -7,8 +7,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/concept/requires.hpp>
-
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -39,9 +37,7 @@ namespace boost { namespace network { namespace http {
 
     template <class Tag>
     inline 
-    BOOST_CONCEPT_REQUIRES(
-        ((Response<basic_response<Tag> >)),
-        (impl::status_message_wrapper<Tag>))
+    impl::status_message_wrapper<Tag>
     status_message(basic_response<Tag> const & response) {
         return impl::status_message_wrapper<Tag>(response);
     }
diff --git a/boost/network/protocol/http/message/wrappers/uri.hpp b/boost/network/protocol/http/message/wrappers/uri.hpp
@@ -7,9 +7,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/network/protocol/http/request_concept.hpp>
-#include <boost/concept/requires.hpp>
-
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -29,8 +26,7 @@ namespace boost { namespace network { namespace http {
     }
 
     template <class Tag> inline
-    BOOST_CONCEPT_REQUIRES(((Request<basic_request<Tag> >)),
-        (impl::uri_wrapper<Tag>))
+    impl::uri_wrapper<Tag>
     uri(basic_request<Tag> const & request) {
         return impl::uri_wrapper<Tag>(request);
     }
diff --git a/boost/network/protocol/http/message/wrappers/version.hpp b/boost/network/protocol/http/message/wrappers/version.hpp
@@ -7,8 +7,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/concept/requires.hpp>
-
 namespace boost { namespace network { namespace http {
 
     template <class Tag>
@@ -39,9 +37,7 @@ namespace boost { namespace network { namespace http {
 
     template <class Tag>
     inline 
-    BOOST_CONCEPT_REQUIRES(
-        ((Response<basic_response<Tag> >)),
-        (impl::version_wrapper<Tag>))
+    impl::version_wrapper<Tag>
     version(basic_response<Tag> const & response) {
         return impl::version_wrapper<Tag>(response);
     }
diff --git a/boost/network/utils/thread_pool.hpp b/boost/network/utils/thread_pool.hpp
diff --git a/libs/network/test/utils_thread_pool.cpp b/libs/network/test/utils_thread_pool.cpp

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace boost { namespace network {`
`25`	`25`	`};`
`26`	`26`
`27`	`27`	`template <class Tag>`
`28`		`- class basic_message;`
	`28`	`+ struct basic_message;`
`29`	`29`
`30`	`30`	`/** headers wrapper for messages.`
`31`	`31`	`*`