Commit3522db6

committed

Merge branch '0.6-devel' of git://github.com/mikhailberis/cpp-netlib into 0.6-devel

2 parents113fc21 +12c62f7 commit3522db6Copy full SHA for 3522db6

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace boost { namespace network { namespace uri {`
`25`	`25`	`basic_uri() : uri_base<tags::http_default_8bit_tcp_resolve>() {}`
`26`	`26`	`basic_uri(uri_base<tags::http_default_8bit_tcp_resolve>::string_typeconst & uri) : uri_base<tags::http_default_8bit_tcp_resolve>(uri) {}`
`27`	`27`
`28`		`- boost::uint32_tport()const {`
	`28`	`+ boost::uint16_tport()const {`
`29`	`29`	`return parts_.port ? *(parts_.port) :`
`30`	`30`	`(boost::iequals(parts_.scheme,string_type("https")) ?443u :80u);`
`31`	`31`	`}`
`@@ -36,7 +36,7 @@ namespace boost { namespace network { namespace uri {`
`36`	`36`	`};`
`37`	`37`
`38`	`38`	`inline`
`39`		`- boost::uint32_t`
	`39`	`+ boost::uint16_t`
`40`	`40`	`port(basic_uri<tags::http_default_8bit_tcp_resolve>const & uri) {`
`41`	`41`	`return uri.port();`
`42`	`42`	`}`

Comments

(0)