Merge branch 'http-client-refactoring' of github.com:deanberris/cpp-netlib into http-client-refactoring

deanberris · deanberris · commit 4de2b327bac5 · 2011-10-28T13:59:47.000+11:00
Conflicts:
	libs/network/src/CMakeLists.txt
diff --git a/boost/network/message/message.ipp b/boost/network/message/message.ipp
@@ -135,6 +135,7 @@ message::message(message const & other)
 
 message& message::operator=(message other) {
   *pimpl = *other.pimpl;
+  return *this;
 }
 
 message::~message() {
diff --git a/libs/network/test/message_test.cpp b/libs/network/test/message_test.cpp
@@ -67,6 +67,6 @@ BOOST_AUTO_TEST_CASE(remove_header_directive_test) {
     message instance;
     instance << header("name", "value")
         << remove_header("name");
-    message::headers_range range = headers(instance);
+    message::headers_range range = headers(instance)["name"];
     BOOST_CHECK ( boost::begin(range) == boost::end(range) );
 }

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ message::message(message const & other)`
`135`	`135`
`136`	`136`	`message& message::operator=(message other) {`
`137`	`137`	`pimpl = other.pimpl;`
	`138`	`+ return *this;`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`message::~message() {`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,6 @@ BOOST_AUTO_TEST_CASE(remove_header_directive_test) {`
`67`	`67`	`message instance;`
`68`	`68`	`instance << header("name", "value")`
`69`	`69`	`<< remove_header("name");`
`70`		`- message::headers_range range = headers(instance);`
	`70`	`+ message::headers_range range = headers(instance)["name"];`
`71`	`71`	`BOOST_CHECK ( boost::begin(range) == boost::end(range) );`
`72`	`72`	`}`