Skip to content

Commit 743dd78

Browse files
committed
Fixing left-in merge markers.
1 parent 4e69162 commit 743dd78

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

boost/network/uri/http/detail/parse_specific.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ namespace boost { namespace network { namespace uri {
8686
parts.fragment
8787
);
8888

89-
<<<<<<< HEAD:boost/network/uri/http/detail/parse_specific.hpp
9089
qi::rule<iterator, string_type::value_type()> gen_delims = qi::char_(":/?#[]@");
9190
qi::rule<iterator, string_type::value_type()> sub_delims = qi::char_("!$&'()*+,;=");
9291

@@ -96,12 +95,8 @@ namespace boost { namespace network { namespace uri {
9695

9796
qi::rule<iterator, string_type()> pchar = qi::raw[unreserved | pct_encoded | sub_delims | qi::char_(":@")];
9897

99-
hostname<tags::http>::parser<iterator> hostname;
100-
bool ok = qi::parse(
101-
=======
10298
hostname<tags::http_default_8bit_tcp_resolve>::parser<iterator> hostname;
10399
bool ok = parse(
104-
>>>>>>> 01140d24f86ceffddabc6f42077ca08d5e4f9e3f:boost/network/uri/http/detail/parse_specific.hpp
105100
start_, end_,
106101
(
107102
qi::lit("//")

boost/network/uri/http/uri.hpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,9 @@ namespace boost { namespace network { namespace uri {
3131
return parts_.host;
3232
}
3333

34-
<<<<<<< HEAD:boost/network/uri/http/uri.hpp
35-
uint16_t port() const {
36-
return parts_.port ? *parts_.port :
37-
(parts_.scheme == "https" ? 443u : 80u);
38-
=======
3934
uint32_t port() const {
4035
return parts_.port ? *(parts_.port) :
4136
(boost::iequals(parts_.scheme, string_type("https")) ? 443u : 80u);
42-
>>>>>>> 01140d24f86ceffddabc6f42077ca08d5e4f9e3f:boost/network/uri/http/uri.hpp
4337
}
4438

4539
string_type path() const {
@@ -67,13 +61,8 @@ namespace boost { namespace network { namespace uri {
6761
}
6862

6963
inline
70-
<<<<<<< HEAD:boost/network/uri/http/uri.hpp
71-
uint16_t
72-
port(basic_uri<tags::http> const & uri) {
73-
=======
7464
uint32_t
7565
port(basic_uri<tags::http_default_8bit_tcp_resolve> const & uri) {
76-
>>>>>>> 01140d24f86ceffddabc6f42077ca08d5e4f9e3f:boost/network/uri/http/uri.hpp
7766
return uri.port();
7867
}
7968

0 commit comments

Comments
 (0)