Fixing message type forwarding and coupling of tags with the message type.

deanberris · deanberris · commit cd551ead97d2 · 2010-10-24T15:09:42.000+08: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
 

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`	`*`