Commit9b16957

committed

Some minor changes to the URI interface.

1 parent380e552 commit9b16957Copy full SHA for 9b16957

File tree

-9

lines changed

-9

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -181,12 +181,12 @@ class basic_uri`
`181`	`181`	`returnstring_type(boost::begin(range),boost::end(range));`
`182`	`182`	`}`
`183`	`183`
`184`		`- string_typeto_string()const {`
	`184`	`+ string_typestring()const {`
`185`	`185`	`return uri_;`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`string_typeraw()const {`
`189`		`-returnto_string();`
	`189`	`+returnstring();`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`boolis_valid()const {`
`@@ -198,7 +198,7 @@ class basic_uri`
`198`	`198`	`voidparse();`
`199`	`199`
`200`	`200`	`string_type uri_;`
`201`		`- detail::uri_parts<typename string<Tag>::type> uri_parts_;`
	`201`	`+ detail::uri_parts<typenameboost::network::string<Tag>::type> uri_parts_;`
`202`	`202`	`bool is_valid_;`
`203`	`203`
`204`	`204`	`};`
`@@ -337,7 +337,7 @@ template <`
`337`	`337`	`>`
`338`	`338`	`inline`
`339`	`339`	`booloperator == (const basic_uri<Tag> &lhs,const basic_uri<Tag> &rhs) {`
`340`		`-return lhs.to_string() == rhs.to_string();`
	`340`	`+returnstd::equal(lhs.begin(), lhs.end(), rhs.begin());`
`341`	`341`	`}`
`342`	`342`	`}// namespace uri`
`343`	`343`	`}// namespace network`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ struct key_value_sequence`
`24`	`24`	`{`
`25`	`25`	`query = pair >> *((spirit::qi::lit(';') \|'&') >> pair);`
`26`	`26`	`pair = key >> -('=' >> value);`
`27`		`- key =spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("a-zA-Z_0-9%");`
`28`		`- value = +spirit::qi::char_("a-zA-Z_0-9%");`
	`27`	`+ key =spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("a-zA-Z_0-9/%");`
	`28`	`+ value = +spirit::qi::char_("a-zA-Z_0-9/%");`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`spirit::qi::rule<const_iterator_type, Map()> query;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(assignment_test, T, tag_types) {`
`233`	`233`	`uri_typeinstance(string_type(boost::begin(url),boost::end(url)));`
`234`	`234`	`uri_type copy;`
`235`	`235`	`copy = instance;`
`236`		`-BOOST_CHECK(instance.to_string() == copy.to_string());`
	`236`	`+BOOST_CHECK(instance.string() == copy.string());`
`237`	`237`	`BOOST_CHECK(instance == copy);`
`238`	`238`	`}`
`239`	`239`
`@@ -277,7 +277,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_query_map_test, T, tag_types) {`
`277`	`277`
`278`	`278`	`std::map<string_type, string_type> queries;`
`279`	`279`	`uri::query_map(instance, queries);`
`280`		`-BOOST_CHECK_EQUAL(queries.size(),std::size_t(1));`
	`280`	`+BOOST_REQUIRE_EQUAL(queries.size(),std::size_t(1));`
`281`	`281`	`BOOST_CHECK(boost::equal(queries.begin()->first, key));`
`282`	`282`	`BOOST_CHECK(boost::equal(queries.begin()->second, value));`
`283`	`283`	`}`
`@@ -295,7 +295,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(xmpp_query_map_test, T, tag_types) {`
`295`	`295`
`296`	`296`	`std::map<string_type, string_type> queries;`
`297`	`297`	`uri::query_map(instance, queries);`
`298`		`-BOOST_CHECK_EQUAL(queries.size(),std::size_t(2));`
	`298`	`+BOOST_REQUIRE_EQUAL(queries.size(),std::size_t(2));`
`299`	`299`	`BOOST_CHECK(boost::equal(queries.begin()->first, key_1));`
`300`	`300`	`BOOST_CHECK(boost::equal(queries.begin()->second, value_1));`
`301`	`301`	`BOOST_CHECK(boost::equal((++queries.begin())->first, key_2));`

Comments

(0)