Commitcd551ea

committed

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

1 parentb1221f6 commitcd551eaCopy full SHA for cd551ea

File tree

+12

-17

lines changed

+12

-17

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`//`
`9`	`9`	`// This is the modular include file for using the basic message type`
`10`	`10`
	`11`	`+#include<boost/network/tags.hpp>`
`11`	`12`	`#include<boost/network/message.hpp>`
`12`	`13`
`13`	`14`	`#endif// BOOST_NETWORK_INCLUDE_MESSAGE_HPP_`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#ifndef __NETWORK_MESSAGE_HPP__`
`7`	`7`	`#define__NETWORK_MESSAGE_HPP__`
`8`	`8`
`9`		`-#include"boost/network/message_fwd.hpp"`
	`9`	`+#include<boost/network/message_fwd.hpp>`
`10`	`10`	`#include<boost/network/traits/string.hpp>`
`11`	`11`	`#include<boost/network/traits/ostringstream.hpp>`
`12`	`12`	`#include<boost/network/traits/headers_container.hpp>`
`@@ -38,7 +38,7 @@ namespace boost { namespace network {`
`38`	`38`	`/** The common message type.`
`39`	`39`	`*/`
`40`	`40`	`template<classTag>`
`41`		`-classbasic_message {`
	`41`	`+structbasic_message {`
`42`	`42`	`public:`
`43`	`43`
`44`	`44`	`typedef Tag tag;`
`@@ -138,9 +138,12 @@ namespace boost { namespace network {`
`138`	`138`	`// swap for ADL`
`139`	`139`	`left.swap(right);`
`140`	`140`	`}`
`141`		`-`
`142`		`-BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_string> >));`
`143`		`-BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_wstring> >));`
	`141`	`+`
	`142`	`+// Commenting this out as we don't need to do this anymore.`
	`143`	`+// BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_string> >));`
	`144`	`+// BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_wstring> >));`
	`145`	`+typedef basic_message<tags::default_string> message;`
	`146`	`+typedef basic_message<tags::default_wstring> wmessage;`
`144`	`147`
`145`	`148`	`}// namespace network`
`146`	`149`	`}// namespace boost`

Lines changed: 1 addition & 1 deletion

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<classTag>`
`28`		`-classbasic_message;`
	`28`	`+structbasic_message;`
`29`	`29`
`30`	`30`	`/** headers wrapper for messages.`
`31`	`31`	`*`

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,12 @@`
`6`	`6`	`#ifndef __2008817MESSAGE_FWD_INC__`
`7`	`7`	`#define__2008817MESSAGE_FWD_INC__`
`8`	`8`
`9`		`-`
`10`		`-// Includes`
`11`		`-#include<boost/network/tags.hpp>`
`12`		`-`
`13`		`-`
`14`	`9`	`namespaceboost {`
`15`	`10`	`namespacenetwork {`
`16`		`-template<`
`17`		`-classTag`
`18`		`- >`
`19`		`-classbasic_message;`
`20`	`11`
	`12`	`+template<classTag>`
	`13`	`+structbasic_message;`
`21`	`14`
`22`		`-typedef basic_message<tags::default_string> message;`
`23`		`-typedef basic_message<tags::default_wstring> wmessage;`
`24`	`15`	`}// namespace boost`
`25`	`16`	`}// namespace network`
`26`	`17`

Comments

(0)