Commit5cb8676

committed

Merge branch 'master' of github.com:cpp-netlib/cpp-netlib

2 parents02cf3ad +350c215 commit5cb8676Copy full SHA for 5cb8676

File tree

+32

-9

lines changed

+32

-9

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,8 @@ struct request : request_base {`
`30`	`30`	`request(requestconst&);`
`31`	`31`	`request&operator=(request);`
`32`	`32`
`33`		`-// Then we lift the swap and equals implementation.`
`34`		`-using request_base::swap;`
`35`		`-using request_base::equals;`
	`33`	`+virtualvoidswap(request& other);`
	`34`	`+virtualboolequals(requestconst& other)const;`
`36`	`35`
`37`	`36`	`// From message_base...`
`38`	`37`	`// Mutators`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,16 @@ request& request::operator=(request rhs) {`
`161`	`161`	`return *this;`
`162`	`162`	`}`
`163`	`163`
	`164`	`+voidrequest::swap(request& other ) {`
	`165`	`+using std::swap;`
	`166`	`+swap(pimpl_, other.pimpl_);`
	`167`	`+request_storage_base::swap(other);`
	`168`	`+}`
	`169`	`+`
	`170`	`+boolrequest::equals(requestconst& other)const {`
	`171`	`+return pimpl_->equals(*other.pimpl_) &&request_storage_base::equals(other);`
	`172`	`+}`
	`173`	`+`
`164`	`174`	`// From message_base...`
`165`	`175`	`// Mutators`
`166`	`176`	`voidrequest::set_destination(std::stringconst& destination) {`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ TEST(request_test, request_storage_flow) {`
`42`	`42`	`ASSERT_EQ(bytes_read,sizeof(data));`
`43`	`43`	`std::string flattened;`
`44`	`44`	`simple.flatten(flattened);`
`45`		`-ASSERT_EQ(flattened,std::string(output,sizeof(data)));`
`46`		`-ASSERT_EQ(std::string(data,sizeof(data)),std::string(output,sizeof(data)));`
	`45`	`+ASSERT_EQ(flattened, output);`
	`46`	`+ASSERT_EQ(std::string(data,sizeof(data)), output);`
`47`	`47`	`simple.clear();`
`48`	`48`	`}`
`49`	`49`
`@@ -58,9 +58,8 @@ TEST(request_test, request_storage_copy) {`
`58`	`58`	`ASSERT_EQ(bytes_read,sizeof(quick_brown));`
`59`	`59`	`std::string flattened;`
`60`	`60`	`copy.flatten(flattened);`
`61`		`-ASSERT_EQ(flattened,std::string(output,sizeof(quick_brown)));`
`62`		`-ASSERT_EQ(std::string(quick_brown,sizeof(quick_brown)),`
`63`		`-std::string(output,sizeof(quick_brown)));`
	`61`	`+ASSERT_EQ(flattened, output);`
	`62`	`+ASSERT_EQ(std::string(quick_brown,sizeof(quick_brown)), output);`
`64`	`63`	`copy.clear();`
`65`	`64`	`flattened.clear();`
`66`	`65`	`original.flatten(flattened);`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,21 @@ TEST(message_test, request_construction) {`
`19`	`19`	`http::requestother(request);`
`20`	`20`	`}`
`21`	`21`
	`22`	`+TEST(message_test, request_swap) {`
	`23`	`+ network::uri tmp_uri;`
	`24`	`+ network::urirequest_uri("http://www.google.com/");`
	`25`	`+ network::uriother_uri("http://www.google.it/");`
	`26`	`+ http::requestrequest(request_uri);`
	`27`	`+ http::requestother(other_uri);`
	`28`	`+`
	`29`	`+ request.swap(other);`
	`30`	`+`
	`31`	`+ request.get_uri(tmp_uri);`
	`32`	`+ASSERT_EQ(tmp_uri, other_uri);`
	`33`	`+ other.get_uri(tmp_uri);`
	`34`	`+ASSERT_EQ(tmp_uri, request_uri);`
	`35`	`+}`
	`36`	`+`
`22`	`37`	`TEST(message_test, request_value_semantics) {`
`23`	`38`	`// First let's default construct a request.`
`24`	`39`	`http::request original;`

Submodule uri updated28 files

Comments

(0)