From afa7f2ae37049b09d18515743ff34dca3f6beb13 Mon Sep 17 00:00:00 2001
From: EdwinGendron <egendron@comconcepts.com>
Date: Wed, 16 Jan 2019 11:08:28 -0500
Subject: [PATCH] add explicit ::boost namespace to make_optional

---
 boost/network/uri/detail/uri_parts.hpp | 33 +++++++++++++++-----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/boost/network/uri/detail/uri_parts.hpp b/boost/network/uri/detail/uri_parts.hpp
index 3fcfe99ae..32c607598 100644
--- a/boost/network/uri/detail/uri_parts.hpp
+++ b/boost/network/uri/detail/uri_parts.hpp
@@ -29,27 +29,30 @@ struct hierarchical_part {
   void update() {
     if (!user_info) {
       if (host) {
-        user_info = make_optional(iterator_range<FwdIter>(std::begin(host.get()),
-                                            std::begin(host.get())));
+        user_info = ::boost::make_optional(
+            iterator_range<FwdIter>(std::begin(host.get()),
+                                    std::begin(host.get())));
       } else if (path) {
-        user_info = make_optional(iterator_range<FwdIter>(std::begin(path.get()),
-                                            std::begin(path.get())));
+        user_info = ::boost::make_optional(
+            iterator_range<FwdIter>(std::begin(path.get()),
+                                    std::begin(path.get())));
       }
     }
 
     if (!host) {
-      host = make_optional(iterator_range<FwdIter>(std::begin(path.get()),
-                                     std::begin(path.get())));
+      host = ::boost::make_optional(
+          iterator_range<FwdIter>(std::begin(path.get()),
+                                  std::begin(path.get())));
     }
 
     if (!port) {
-      port = make_optional(iterator_range<FwdIter>(std::end(host.get()),
-                                     std::end(host.get())));
+      port = ::boost::make_optional(
+          iterator_range<FwdIter>(std::end(host.get()), std::end(host.get())));
     }
 
     if (!path) {
-      path = make_optional(iterator_range<FwdIter>(std::end(port.get()),
-                                     std::end(port.get())));
+      path = ::boost::make_optional(
+          iterator_range<FwdIter>(std::end(port.get()), std::end(port.get())));
     }
   }
 };
@@ -70,13 +73,15 @@ struct uri_parts {
     hier_part.update();
 
     if (!query) {
-      query = make_optional(iterator_range<FwdIter>(std::end(hier_part.path.get()),
-                                      std::end(hier_part.path.get())));
+      query = ::boost::make_optional(
+          iterator_range<FwdIter>(std::end(hier_part.path.get()),
+                                  std::end(hier_part.path.get())));
     }
 
     if (!fragment) {
-      fragment = make_optional(iterator_range<FwdIter>(std::end(query.get()),
-                                         std::end(query.get())));
+      fragment = ::boost::make_optional(
+          iterator_range<FwdIter>(std::end(query.get()),
+                                  std::end(query.get())));
     }
   }
 };