Addressing breaking changes in Boost V1.66

STEllAR-GROUP · Dec 23, 2017 · e6f5ba9 · e6f5ba9
1 parent c9beadf
commit e6f5ba9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/util/asio_util.cpp b/src/util/asio_util.cpp
@@ -237,9 +237,14 @@ namespace hpx { namespace util
             tcp::endpoint ep;
             if (util::get_endpoint(address, port, ep))
             {
+#if BOOST_VERSION < 106600
                 return endpoint_iterator_type(tcp::resolver::iterator::create(
                     ep, address, port_str));
-            }
+#else
+                return endpoint_iterator_type(tcp::resolver::results_type::create(
+                    ep, address, port_str));
+#endif
+}
         }
         catch (boost::system::system_error const&) {
             errors.add(std::current_exception());
@@ -288,8 +293,13 @@ namespace hpx { namespace util
             tcp::endpoint ep;
             if (util::get_endpoint(address, port, ep))
             {
+#if BOOST_VERSION < 106600
                 return endpoint_iterator_type(
                     tcp::resolver::iterator::create(ep, address, port_str));
+#else
+                return endpoint_iterator_type(
+                    tcp::resolver::results_type::create(ep, address, port_str));
+#endif
             }
         }
         catch (boost::system::system_error const&) {

diff --git a/src/util/serialize_exception.cpp b/src/util/serialize_exception.cpp
@@ -331,7 +331,7 @@ namespace hpx { namespace serialization
         case hpx::util::boost_system_error:
             e = hpx::detail::construct_exception(
                     boost::system::system_error(err_value,
-#ifndef BOOST_SYSTEM_NO_DEPRECATED
+#if BOOST_VERSION < 10660 && !defined(BOOST_SYSTEM_NO_DEPRECATED)
                         boost::system::get_system_category()
 #else
                         boost::system::system_category()