Fixing header include order in the message implementation.

Dean Michael Berris · Dean Michael Berris · commit eb129c9909d8 · 2010-09-03T17:33:29.000+08:00
diff --git a/boost/network/message.hpp b/boost/network/message.hpp
@@ -6,23 +6,15 @@
 #ifndef __NETWORK_MESSAGE_HPP__
 #define __NETWORK_MESSAGE_HPP__
 
-#include <map>
-#include <string>
-
-
-// include message declaration
 #include "boost/network/message_fwd.hpp"
-
-// include traits implementation
 #include <boost/network/traits/string.hpp>
 #include <boost/network/traits/ostringstream.hpp>
 #include <boost/network/traits/headers_container.hpp>
-
-// include directives base
 #include <boost/network/detail/directive_base.hpp>
-
-// include wrappers base
 #include <boost/network/detail/wrapper_base.hpp>
+#include <boost/network/message/directives.hpp>
+#include <boost/network/message/wrappers.hpp>
+#include <boost/network/message/transformers.hpp>
 
 #include <boost/network/message/message_concept.hpp>
 
@@ -122,14 +114,5 @@ BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_wstrin
 } // namespace network
 } // namespace boost
 
-#include <boost/network/message/directives.hpp>
-    // pull in directives header file
-
-#include <boost/network/message/wrappers.hpp>
-    // pull in wrappers header file
-
-#include <boost/network/message/transformers.hpp>
-    // pull in transformer header file
-
 #endif // __NETWORK_MESSAGE_HPP__
 
diff --git a/boost/network/protocol/http/server.hpp b/boost/network/protocol/http/server.hpp
@@ -13,6 +13,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
 #include <boost/asio/ip/tcp.hpp>
+#include <boost/network/protocol/http/request.hpp>
+#include <boost/network/protocol/http/response.hpp>
 #include <boost/network/protocol/http/connection.hpp>
 #include <boost/network/traits/string.hpp>
 
diff --git a/boost/network/uri/basic_uri.hpp b/boost/network/uri/basic_uri.hpp
@@ -100,7 +100,7 @@ namespace boost { namespace network { namespace uri {
     template <class Tag> 
         struct basic_uri : uri_base<Tag> {
             using uri_base<Tag>::operator=;
-            using uri_base<Tag>::string_type;
+            using typename uri_base<Tag>::string_type;
             using uri_base<Tag>::operator==;
             using uri_base<Tag>::operator!=;
             basic_uri() : uri_base<Tag>() {}
