File tree Expand file tree Collapse file tree 2 files changed +0
-16
lines changed Expand file tree Collapse file tree 2 files changed +0
-16
lines changed Original file line number Diff line number Diff line change @@ -86,7 +86,6 @@ namespace boost { namespace network { namespace uri {
86
86
parts.fragment
87
87
);
88
88
89
- <<<<<<< HEAD:boost/network/uri/http/detail/parse_specific.hpp
90
89
qi::rule<iterator, string_type::value_type ()> gen_delims = qi::char_ (" :/?#[]@" );
91
90
qi::rule<iterator, string_type::value_type ()> sub_delims = qi::char_ (" !$&'()*+,;=" );
92
91
@@ -96,12 +95,8 @@ namespace boost { namespace network { namespace uri {
96
95
97
96
qi::rule<iterator, string_type ()> pchar = qi::raw[unreserved | pct_encoded | sub_delims | qi::char_ (" :@" )];
98
97
99
- hostname<tags::http>::parser<iterator> hostname;
100
- bool ok = qi::parse (
101
- =======
102
98
hostname<tags::http_default_8bit_tcp_resolve>::parser<iterator> hostname;
103
99
bool ok = parse (
104
- >>>>>>> 01140d24f86ceffddabc6f42077ca08d5e4f9e3f:boost/network/uri/http/detail/parse_specific.hpp
105
100
start_, end_,
106
101
(
107
102
qi::lit (" //" )
Original file line number Diff line number Diff line change @@ -31,15 +31,9 @@ namespace boost { namespace network { namespace uri {
31
31
return parts_.host ;
32
32
}
33
33
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
- =======
39
34
uint32_t port () const {
40
35
return parts_.port ? *(parts_.port ) :
41
36
(boost::iequals (parts_.scheme , string_type (" https" )) ? 443u : 80u );
42
- >>>>>>> 01140d24f86ceffddabc6f42077ca08d5e4f9e3f:boost/network/uri/http/uri.hpp
43
37
}
44
38
45
39
string_type path () const {
@@ -67,13 +61,8 @@ namespace boost { namespace network { namespace uri {
67
61
}
68
62
69
63
inline
70
- <<<<<<< HEAD:boost/network/uri/http/uri.hpp
71
- uint16_t
72
- port (basic_uri<tags::http> const & uri) {
73
- =======
74
64
uint32_t
75
65
port (basic_uri<tags::http_default_8bit_tcp_resolve> const & uri) {
76
- >>>>>>> 01140d24f86ceffddabc6f42077ca08d5e4f9e3f:boost/network/uri/http/uri.hpp
77
66
return uri.port ();
78
67
}
79
68
You can’t perform that action at this time.
0 commit comments