Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit 0a4d2a6

Browse files
egendron93deanberris
authored andcommitted
add explicit ::boost namespace to make_optional (cpp-netlib#869)
1 parent ca95f04 commit 0a4d2a6

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

boost/network/uri/detail/uri_parts.hpp

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,30 @@ struct hierarchical_part {
2929
void update() {
3030
if (!user_info) {
3131
if (host) {
32-
user_info = make_optional(iterator_range<FwdIter>(std::begin(host.get()),
33-
std::begin(host.get())));
32+
user_info = ::boost::make_optional(
33+
iterator_range<FwdIter>(std::begin(host.get()),
34+
std::begin(host.get())));
3435
} else if (path) {
35-
user_info = make_optional(iterator_range<FwdIter>(std::begin(path.get()),
36-
std::begin(path.get())));
36+
user_info = ::boost::make_optional(
37+
iterator_range<FwdIter>(std::begin(path.get()),
38+
std::begin(path.get())));
3739
}
3840
}
3941

4042
if (!host) {
41-
host = make_optional(iterator_range<FwdIter>(std::begin(path.get()),
42-
std::begin(path.get())));
43+
host = ::boost::make_optional(
44+
iterator_range<FwdIter>(std::begin(path.get()),
45+
std::begin(path.get())));
4346
}
4447

4548
if (!port) {
46-
port = make_optional(iterator_range<FwdIter>(std::end(host.get()),
47-
std::end(host.get())));
49+
port = ::boost::make_optional(
50+
iterator_range<FwdIter>(std::end(host.get()), std::end(host.get())));
4851
}
4952

5053
if (!path) {
51-
path = make_optional(iterator_range<FwdIter>(std::end(port.get()),
52-
std::end(port.get())));
54+
path = ::boost::make_optional(
55+
iterator_range<FwdIter>(std::end(port.get()), std::end(port.get())));
5356
}
5457
}
5558
};
@@ -70,13 +73,15 @@ struct uri_parts {
7073
hier_part.update();
7174

7275
if (!query) {
73-
query = make_optional(iterator_range<FwdIter>(std::end(hier_part.path.get()),
74-
std::end(hier_part.path.get())));
76+
query = ::boost::make_optional(
77+
iterator_range<FwdIter>(std::end(hier_part.path.get()),
78+
std::end(hier_part.path.get())));
7579
}
7680

7781
if (!fragment) {
78-
fragment = make_optional(iterator_range<FwdIter>(std::end(query.get()),
79-
std::end(query.get())));
82+
fragment = ::boost::make_optional(
83+
iterator_range<FwdIter>(std::end(query.get()),
84+
std::end(query.get())));
8085
}
8186
}
8287
};

0 commit comments

Comments
 (0)