@@ -29,27 +29,30 @@ struct hierarchical_part {
2929void update () {
3030if (!user_info) {
3131if (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
4042if (!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
4548if (!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
5053if (!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
7275if (!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
7781if (!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};